| commit | 45f37e86f1ef95f002386d8a0ab508407cec9bf3 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Feb 02 08:27:00 2008 +1100 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Feb 02 08:27:00 2008 +1100 |
| tree | aeae54129b9a440b2d1d80a80d84070a91e83c9c | |
| parent | e30ec4525d4731d828a754823a83a3d6b50bb230 [diff] | |
| parent | aa7d93506cc26378be6964692cd0dd34cffaee25 [diff] |
Merge git://git.kernel.org/pub/scm/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