Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 3 Dec 2007 16:21:06 +0000 (08:21 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 3 Dec 2007 16:21:06 +0000 (08:21 -0800)
commitca6435f188a0ce40eae716c158053e49130886a3
tree99d58ba96adc568bd227c48669940ab726ca18bf
parent26145f7e7ebc8a5f1b29425d6da62e872031be4a
parentd842de871c8c5e2110c7e4f3f29bbe7b1a519ab8
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: cpu accounting controller (V2)