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:
  sched: cpu accounting controller (V2)
This commit is contained in:
Linus Torvalds
2007-12-03 08:21:06 -08:00
5 changed files with 150 additions and 26 deletions
+7
View File
@@ -30,3 +30,10 @@ SUBSYS(cpu_cgroup)
#endif
/* */
#ifdef CONFIG_CGROUP_CPUACCT
SUBSYS(cpuacct)
#endif
/* */