From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 24 Aug 2007 23:11:13 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
X-Git-Tag: MMI-PSA29.97-13-9~40651
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d1caeb02b17c6bc215a9a40a98a1beb92dcbd310;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.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 startup penalty calculation
  sched: simplify bonus calculation #2
  sched: simplify bonus calculation #1
  sched: tidy up and simplify the bonus balance
  sched: optimize task_tick_rt() a bit
  sched: simplify can_migrate_task()
  sched: remove HZ dependency from the granularity default
  sched: CONFIG_SCHED_GROUP_FAIR=y fixlet
---

d1caeb02b17c6bc215a9a40a98a1beb92dcbd310