From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 12 Dec 2012 02:22:46 +0000 (-0800)
Subject: Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: Ubuntu-5.0.0-8.9~14735
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b64c5fda3868cb29d5dae0909561aa7d93fb7330;p=mirror_ubuntu-disco-kernel.git

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull core timer changes from Ingo Molnar:
 "It contains continued generic-NOHZ work by Frederic and smaller
  cleanups."

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  time: Kill xtime_lock, replacing it with jiffies_lock
  clocksource: arm_generic: use this_cpu_ptr per-cpu helper
  clocksource: arm_generic: use integer math helpers
  time/jiffies: Make clocksource_jiffies static
  clocksource: clean up parse_pmtmr()
  tick: Correct the comments for tick_sched_timer()
  tick: Conditionally build nohz specific code in tick handler
  tick: Consolidate tick handling for high and low res handlers
  tick: Consolidate timekeeping handling code
---

b64c5fda3868cb29d5dae0909561aa7d93fb7330