]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Sep 2013 19:36:46 +0000 (12:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Sep 2013 19:36:46 +0000 (12:36 -0700)
commit868fa161f1ddf36ed2d49edf2684964b72723e3b
tree78e4c6386f40bdaa1c3a9af869bcdc9b1a52818c
parent4da0dae0c721fb6231a0515ab2196c35b5ab4015
parent06a472e8daa0dfba37e325de4a7b12aceb2a09f0
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull cputime fix from Ingo Molnar:
 "This fixes a longer-standing cputime accounting bug that Stanislaw
  Gruszka finally managed to track down"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/cputime: Do not scale when utime == 0
kernel/sched/cputime.c