Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/
timers: fix build error in !oneshot case
x86: c1e_idle: don't mark TSC unstable if CPU has invariant TSC
x86: prevent C-states hang on AMD C1E enabled machines
clockevents: prevent mode mismatch on cpu online
clockevents: check broadcast device not tick device
clockevents: prevent stale tick_next_period for onlining CPUs
x86: prevent stale state of c1e_mask across CPU offline/online
clockevents: prevent cpu online to interfere with nohz
(01:56:18 PM) ivoks: if i'm not wrong, that's in -5 kernel
seems so:
carl@dv67: ~/src/ubuntu- kernel/ ubuntu- intrepid$ git log 21135ac4797b5f3 7bf80ae2e9
...
commit 8553f321e0fd298
Merge: be3be89... f8e256c...
Author: Linus Torvalds <email address hidden>
Date: Tue Sep 23 14:57:36 2008 -0700
Merge branch 'timers- fixes-for- linus' of git://git. kernel. org/pub/ scm/linux/
* 'timers- fixes-for- linus' of git://git. kernel. org/pub/ scm/linux/ kernel/ git/
timers: fix build error in !oneshot case
x86: c1e_idle: don't mark TSC unstable if CPU has invariant TSC
x86: prevent C-states hang on AMD C1E enabled machines
clockevents: prevent mode mismatch on cpu online
clockevents: check broadcast device not tick device
clockevents: prevent stale tick_next_period for onlining CPUs
x86: prevent stale state of c1e_mask across CPU offline/online
clockevents: prevent cpu online to interfere with nohz