]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
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)
commit1ce1e41c1b61a992077bd1c45c6c3fd6a8b10c02
tree33d958f957e77c93612b027deb91f2e81b08d372
parent87ac6fa26e0e7ea49e1c8030e962effc05e1c5eb
parentf6c3f1686e7ec1dd8725a9a3dcb857dfd0c7a5bf
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 nohz balance kick
  sched: Fix user time incorrectly accounted as system time on 32-bit