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)
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


Trivial merge