From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 8 Jun 2013 22:51:21 +0000 (-0700)
Subject: Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~3680^2~340
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=81db4dbf592b486ac2bc7cabfb328ee2a6c4725d;p=firefly-linux-kernel-4.4.55.git

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

Pull timer fixes from Thomas Gleixner:

 - Trivial: unused variable removal

 - Posix-timers: Add the clock ID to the new proc interface to make it
   useful.  The interface is new and should be functional when we reach
   the final 3.10 release.

 - Cure a false positive warning in the tick code introduced by the
   overhaul in 3.10

 - Fix for a persistent clock detection regression introduced in this
   cycle

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timekeeping: Correct run-time detection of persistent_clock.
  ntp: Remove unused variable flags in __hardpps
  posix-timers: Show clock ID in proc file
  tick: Cure broadcast false positive pending bit warning
---

81db4dbf592b486ac2bc7cabfb328ee2a6c4725d