Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Mar 2012 00:11:15 +0000 (17:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Mar 2012 00:11:15 +0000 (17:11 -0700)
commit5ed59af85077d28875a3a137b21933aaf1b4cd50
treed225d654de47ebe480a59d479ae5b3cc7c90cd71
parentb7f077d7bc28649f6bd369fadec01219e725a9c6
parent81b40539e748b108d143a5e38526ab00a6a784b6
Merge branch 'core-locking-for-linus' of git://git./linux/kernel/git/tip/tip

Pull core/locking changes for v3.4 from Ingo Molnar

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  futex: Simplify return logic
  futex: Cover all PI opcodes with cmpxchg enabled check
kernel/futex.c