From: Linus Torvalds <torvalds@linux-foundation.org>
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-Tag: v2.6.25-rc1~1082
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45f37e86f1ef95f002386d8a0ab508407cec9bf3;p=linux-2.6

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