From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Sep 2013 19:36:46 +0000 (-0700)
Subject: Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~176^2~5421
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=57d730924d5cc2c3e280af16a9306587c3a511db;p=firefly-linux-kernel-4.4.55.git

Merge branch 'timers-urgent-for-linus' of git://git./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
---

57d730924d5cc2c3e280af16a9306587c3a511db