From: Linus Torvalds Date: Fri, 1 Feb 2008 21:27:00 +0000 (+1100) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=45f37e86f1ef95f002386d8a0ab508407cec9bf3;p=linux-beck.git 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 --- 45f37e86f1ef95f002386d8a0ab508407cec9bf3