tree 1d239bdf2f0fe62f278faf895f662f2f5b43c3e6
parent 77b67063bb6bce6d475e910d3b886a606d0d91f7
parent 59fa6245192159ab5e1e17b8e31f15afa9cff4bf
author Linus Torvalds <torvalds@linux-foundation.org> 1352768541 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1352768541 -0800

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

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