Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
commitfa2dd441df28b9fdfc68f84ae66f1b507cfff0e4
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 7 Dec 2007 19:00:46 +0000 (7 11:00 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 7 Dec 2007 19:00:46 +0000 (7 11:00 -0800)
treeebef1a5e5834c9569b4f913e5c61a91e8ce093a0
parente17587b5b90da78f56c7a948e54dbac3dc791f31
parent8ced5f69e4bc09adcc6442e090e2e64c197246cf
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:
  sched: enable early use of sched_clock()
  lockdep: make cli/sti annotation warnings clearer