Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Oct 2012 17:45:16 +0000 (10:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Oct 2012 17:45:16 +0000 (10:45 -0700)
commit2fff56641be96acd938c8bd8f5f4f6d04795436f
tree656454f704f7ece2177bafaa7f6107409cd9a2f0
parent0b981cb94bc63a2d0e5eccccdca75fe57643ffce
parentc5f66e99b7cb091e3d51ae8e8156892e8feb7fa3
Merge branch 'timers-core-for-linus' of git://git./linux/kernel/git/tip/tip

Pull timer changes from Ingo Molnar:
 "Timer enhancements, generalizations and cleanups from Tejun Heo, in
  preparation for workqueue facility enhancements."

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timer: Implement TIMER_IRQSAFE
  timer: Clean up timer initializers
  timer: Relocate declarations of init_timer_on_stack_key()
  timer: Generalize timer->base flags handling
kernel/timer.c