]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Nov 2012 01:02:21 +0000 (17:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Nov 2012 01:02:21 +0000 (17:02 -0800)
Pull futex fix from Thomas Gleixner:
 "Single fix for a long standing futex race when taking over a futex
  whose owner died.  You can end up with two owners, which violates
  quite some rules."

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  futex: Handle futex_pi OWNER_DIED take over correctly


Trivial merge