Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 20 Dec 2007 19:53:41 +0000 (11:53 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 20 Dec 2007 19:53:41 +0000 (11:53 -0800)
commitfaa4877f023bafa35239d411b160955dc0629fe9
tree786e746ad7a1e8485b17b33d9865e0128d51f6cc
parent17eb2c3b56afe72f76330b5db657c8b4fc98aa39
parent2c3b20e91fe3a083c5d9bc79437c485866ea251c
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:
  debug: add end-of-oops marker
  sched: rt: account the cpu time during the tick