commit | 57d730924d5cc2c3e280af16a9306587c3a511db | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Sep 05 12:36:46 2013 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Sep 05 12:36:46 2013 -0700 |
tree | 78e4c6386f40bdaa1c3a9af869bcdc9b1a52818c | |
parent | 050ba07cdc9aaef17e1be251aa8fceb9a919d5d3 [diff] | |
parent | 5a8e01f8fa51f5cbce8f37acc050eb2319d12956 [diff] |
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