tree bdd513a1dba0c7fc99645453aef5bc7bb7343a0e
parent 65131cd52b9e7c5814298e05c3b7843f13e78d24
parent 5cbd54ef470d880fc37fbe4b21eb514806d51e0d
author Linus Torvalds <torvalds@linux-foundation.org> 1226539364 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1226539364 -0800

Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: fix init_idle()'s use of sched_clock()
  sched: fix stale value in average load per task