diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 10:45:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 10:45:16 -0700 |
| commit | 2fff56641be96acd938c8bd8f5f4f6d04795436f (patch) | |
| tree | 656454f704f7ece2177bafaa7f6107409cd9a2f0 /kernel/jump_label.c | |
| parent | 0b981cb94bc63a2d0e5eccccdca75fe57643ffce (diff) | |
| parent | c5f66e99b7cb091e3d51ae8e8156892e8feb7fa3 (diff) | |
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'kernel/jump_label.c')
0 files changed, 0 insertions, 0 deletions