diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-23 14:57:36 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-23 14:57:36 -0700 |
commit | 8553f321e0fd29821135ac4797b5f37bf80ae2e9 (patch) | |
tree | fa64ef70c4e503f62a09b56b792bb63b791aa121 /arch/x86/kernel/olpc.c | |
parent | be3be8905854d2fcf6030f1da9ebc221e9e2c5f1 (diff) | |
parent | f8e256c687eb53850685747757c8d75e58756e15 (diff) | |
download | op-kernel-dev-8553f321e0fd29821135ac4797b5f37bf80ae2e9.zip op-kernel-dev-8553f321e0fd29821135ac4797b5f37bf80ae2e9.tar.gz |
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
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
Diffstat (limited to 'arch/x86/kernel/olpc.c')
0 files changed, 0 insertions, 0 deletions