From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 1 Apr 2014 17:16:10 +0000 (-0700)
Subject: Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.15-rc1~156
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a21e40877ad130de837b0394583e4f68dc2ab6c5;p=linux-2.6-block.git

Merge branch 'timers-nohz-for-linus' of git://git./linux/kernel/git/tip/tip

Pull timer updates from Ingo Molnar:
 "The main purpose is to fix a full dynticks bug related to
  virtualization, where steal time accounting appears to be zero in
  /proc/stat even after a few seconds of competing guests running busy
  loops in a same host CPU.  It's not a regression though as it was
  there since the beginning.

  The other commits are preparatory work to fix the bug and various
  cleanups"

* 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  arch: Remove stub cputime.h headers
  sched: Remove needless round trip nsecs <-> tick conversion of steal time
  cputime: Fix jiffies based cputime assumption on steal accounting
  cputime: Bring cputime -> nsecs conversion
  cputime: Default implementation of nsecs -> cputime conversion
  cputime: Fix nsecs_to_cputime() return type cast
---

a21e40877ad130de837b0394583e4f68dc2ab6c5