Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Feb 2008 21:27:00 +0000 (08:27 +1100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Feb 2008 21:27:00 +0000 (08:27 +1100)
commit45f37e86f1ef95f002386d8a0ab508407cec9bf3
treeaeae54129b9a440b2d1d80a80d84070a91e83c9c
parente30ec4525d4731d828a754823a83a3d6b50bb230
parentaa7d93506cc26378be6964692cd0dd34cffaee25
Merge git://git./linux/kernel/git/mingo/linux-2.6-sched

* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
  latencytop: Change Kconfig dependency.
  futex: Add bitset conditional wait/wakeup functionality
  futex: Remove warn on in return fixup path
  x86: replace LOCK_PREFIX in futex.h
  tick-sched: add more debug information
  timekeeping: update xtime_cache when time(zone) changes
  hrtimer: fix hrtimer_init_sleeper() users