]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit
projects / ceph-client.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 050ba07 5a8e01f)
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)
commit57d730924d5cc2c3e280af16a9306587c3a511db
tree78e4c6386f40bdaa1c3a9af869bcdc9b1a52818ctree | snapshot
parent050ba07cdc9aaef17e1be251aa8fceb9a919d5d3commit | diff
parent5a8e01f8fa51f5cbce8f37acc050eb2319d12956commit | 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
kernel/sched/cputime.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.