Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Sep 2010 20:22:10 +0000 (13:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Sep 2010 20:22:10 +0000 (13:22 -0700)
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: Fix nohz balance kick
  sched: Fix user time incorrectly accounted as system time on 32-bit


Trivial merge