Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
commitdb8185360d91c01f6e482db5ee402c0ad90dec52
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 29 Oct 2007 21:06:19 +0000 (29 14:06 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 29 Oct 2007 21:06:19 +0000 (29 14:06 -0700)
tree5195407be8483cd9ae206a7877d60ebb886112bd
parent6a22c57b8d2a62dea7280a6b2ac807a539ef0716
parent38605cae99d386332df6822a22dba7bfdc8fae1c
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: fix style in kernel/sched.c
  sched: fix style of swap() macro in kernel/sched_fair.c
  sched: report CPU usage in CFS cgroup directories
  sched: move rcu_head to task_group struct
  sched: fix incorrect assumption that cpu 0 exists
  sched: keep utime/stime monotonic
  sched: make kernel/sched.c:account_guest_time() static