diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 19:39:57 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 19:39:57 +0200 |
commit | da6e88f4963385b1b649b043691d206fbb951913 (patch) | |
tree | 779a1a6cf04dad09dee0828ad4ece0927de1b5f3 /init | |
parent | Merge branch 'genirq' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/li... (diff) | |
parent | Merge commit '900cfa46191a7d87cf1891924cb90499287fd235'; branches 'timers/noh... (diff) | |
download | linux-da6e88f4963385b1b649b043691d206fbb951913.tar.xz linux-da6e88f4963385b1b649b043691d206fbb951913.zip |
Merge branch 'timers/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: add PCI ID for 6300ESB force hpet
x86: add another PCI ID for ICH6 force-hpet
kernel-paramaters: document pmtmr= command line option
acpi_pm clccksource: fix printk format warning
nohz: don't stop idle tick if softirqs are pending.
pmtmr: allow command line override of ioport
nohz: reduce jiffies polling overhead
hrtimer: Remove unused variables in ktime_divns()
hrtimer: remove warning in hres_timers_resume
posix-timers: print RT watchdog message
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions