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)
* 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


Trivial merge