From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 29 Oct 2007 21:06:19 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
X-Git-Tag: v2.6.24-rc2~96
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=db8185360d91c01f6e482db5ee402c0ad90dec52;p=linux-2.6-block.git

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

db8185360d91c01f6e482db5ee402c0ad90dec52