diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-12 15:16:26 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-12 15:16:26 -0700 |
commit | ccb1ec95e924a24906ef01ce6d028a8dc13dc87d (patch) | |
tree | b16a02083ba6843fe3f2513f74a72c95d43ddccb /net/ipv4 | |
parent | 4a1d7544fee5e601a4e642ce2720689f90428d65 (diff) | |
parent | d48fc63f6f3f485ed5aa9cf019d8e8e3a7d10263 (diff) | |
download | linux-3.10-ccb1ec95e924a24906ef01ce6d028a8dc13dc87d.tar.gz linux-3.10-ccb1ec95e924a24906ef01ce6d028a8dc13dc87d.tar.bz2 linux-3.10-ccb1ec95e924a24906ef01ce6d028a8dc13dc87d.zip |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner:
"The itimer removal one is not strictly a fix, but I really wanted to
avoid a rebase of the urgent ones."
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
Revert "clocksource: Load the ACPI PM clocksource asynchronously"
clockevents: tTack broadcast device mode change in tick_broadcast_switch_to_oneshot()
itimer: Use printk_once instead of WARN_ONCE
nohz: Fix stale jiffies update in tick_nohz_restart()
tick: Document TICK_ONESHOT config option
proc: stats: Use arch_idle_time for idle and iowait times if available
itimer: Schedule silent NULL pointer fixup in setitimer() for removal
Diffstat (limited to 'net/ipv4')
0 files changed, 0 insertions, 0 deletions