Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Aug 2012 18:00:26 +0000 (11:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Aug 2012 18:00:26 +0000 (11:00 -0700)
commitc4e62d67854e247b09ffe763163057237c8b1614
treeddcdca15427671ab44334320e91b67877aa95f1a
parent1ca0049f2c8b28611f30798aa75858763c9fcbea
parent6f7b0a2a5c0fb03be7c25bd1745baa50582348ef
Merge branch 'core-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull futex fixes from Ingo Molnar:
 "A couple of futex fixes from Darren Hart: two bugs reported by Dave
  Jones (found with his trinity test) and Dan Carpenter through static
  analysis.  The third found while debugging the first two."

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  futex: Forbid uaddr == uaddr2 in futex_wait_requeue_pi()
  futex: Fix bug in WARN_ON for NULL q.pi_state
  futex: Test for pi_mutex on fault in futex_wait_requeue_pi()