tree 00f55468065e2f290aa3f24bdc61654f82da9dcc
parent 1c2ffff407140adf75bb72ae375688480793a228
parent 392741e0a4e17c82e3978b7fcbf04291294dc0a1
author Linus Torvalds <torvalds@linux-foundation.org> 1250190556 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1250190556 -0700

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

* '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