From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sun, 12 Aug 2007 18:06:45 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
X-Git-Tag: Ubuntu-5.0.0-8.9~40080
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=738ddd30397c25adfa9729257623ada96ef8ce96;p=mirror_ubuntu-disco-kernel.git

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: run_rebalance_domains: s/SCHED_IDLE/CPU_IDLE/
  sched: fix sleeper bonus
  sched: make global code static
---

738ddd30397c25adfa9729257623ada96ef8ce96