Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Jan 2011 20:45:04 +0000 (06:45 +1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Jan 2011 20:45:04 +0000 (06:45 +1000)
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: Use rq->clock_task instead of rq->clock for correctly maintaining load averages
  sched: Fix/remove redundant cfs_rq checks
  sched: Fix sign under-flows in wake_affine


Trivial merge