]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Aug 2009 19:09:16 +0000 (12:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Aug 2009 19:09:16 +0000 (12:09 -0700)
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  futex: Fix handling of bad requeue syscall pairing
  futex: Fix compat_futex to be same as futex for REQUEUE_PI
  locking, sched: Give waitqueue spinlocks their own lockdep classes
  futex: Update futex_q lock_ptr on requeue proxy lock


Trivial merge