From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 1 Mar 2015 19:27:04 +0000 (-0800)
Subject: Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.0~186
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2ea51b884b07ac7fbb49eb91860eb05c13161ad2;p=platform%2Fkernel%2Flinux-amlogic.git

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

2ea51b884b07ac7fbb49eb91860eb05c13161ad2