tree bb42fbbee400f55b13f49f30b392367798602652
parent c3e58a7945c8f1e4ec09ef93832a3839c5a70be2
parent 67dd331c5d811b2e50c935a24c82f31b61c6dcd3
author Linus Torvalds <torvalds@linux-foundation.org> 1370731881 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1370731881 -0700

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