diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-13 00:16:26 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-13 00:16:26 +0200 |
| commit | ccb1ec95e924a24906ef01ce6d028a8dc13dc87d (patch) | |
| tree | b16a02083ba6843fe3f2513f74a72c95d43ddccb /drivers/acpi/wakeup.c | |
| parent | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | Revert "clocksource: Load the ACPI PM clocksource asynchronously" (diff) | |
| download | linux-ccb1ec95e924a24906ef01ce6d028a8dc13dc87d.tar.xz linux-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 'drivers/acpi/wakeup.c')
0 files changed, 0 insertions, 0 deletions