diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-25 18:02:25 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-25 18:02:25 +0100 |
commit | 32e8d18683adb322c994d1a0fe02d66380991f45 (patch) | |
tree | 1c697f6d1c042dc560b096dca76680f4acf415b3 /kernel/time | |
parent | Linux 2.6.28 (diff) | |
parent | clocksource, acpi_pm.c: put acpi_pm_read_slow() under CONFIG_PCI (diff) | |
parent | x86: make sure we really have an hpet mapping before using it (diff) | |
parent | hrtimers: fix warning in kernel/hrtimer.c (diff) | |
parent | nohz: suppress needless timer reprogramming (diff) | |
parent | linux/timex.h: cleanup for userspace (diff) | |
parent | posix-timers: simplify de_thread()->exit_itimers() path (diff) | |
parent | Merge commit 'v2.6.28-rc4' into timers/rtc (diff) | |
download | linux-32e8d18683adb322c994d1a0fe02d66380991f45.tar.xz linux-32e8d18683adb322c994d1a0fe02d66380991f45.zip |
Merge branches 'timers/clocksource', 'timers/hpet', 'timers/hrtimers', 'timers/nohz', 'timers/ntp', 'timers/posixtimers' and 'timers/rtc' into timers/core