Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 1 Mar 2015 19:27:04 +0000 (11:27 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 1 Mar 2015 19:27:04 +0000 (11:27 -0800)
commit2ea51b884b07ac7fbb49eb91860eb05c13161ad2
tree15c218993387a1603ddab315b4bd95d5e29a17ea
parentae1aa797e0ace9bbce055e31de1f641e422a082a
parent9d3e2d02f54160725d97f4ab1e1e8de493fbf33a
Merge branch 'locking-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull locking fix from Ingo Molnar:
 "An rtmutex deadlock path fixlet"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking/rtmutex: Set state back to running on error