Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 May 2013 21:56:31 +0000 (14:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 May 2013 21:56:31 +0000 (14:56 -0700)
commit0279b3c0ada1d78882f24acf94ac4595bd657a89
treeba31505ea6581b840604493d0233857bb7ce58d1
parent797994f81a8b2bdca2eecffa415c1e7a89a4f961
parentf3002134158092178be81339ec5a22ff80e6c308
Merge branch 'sched-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull scheduler fixes from Ingo Molnar:
 "This fixes the cputime scaling overflow problems for good without
  having bad 32-bit overhead, and gets rid of the div64_u64_rem() helper
  as well."

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  Revert "math64: New div64_u64_rem helper"
  sched: Avoid prev->stime underflow
  sched: Do not account bogus utime
  sched: Avoid cputime scaling overflow
kernel/sched/cputime.c