tree 4ed5e724ce073c270fb9e4d8d9cb665b826ff111
parent 37a3cc99d5048df62bb201c0b45a51ba94497e45
parent 095e56c7036fe97bc3ebcd80ed6e121be0847656
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1187997073 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1187997073 -0700

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