diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 10:39:57 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 10:39:57 -0700 |
commit | da6e88f4963385b1b649b043691d206fbb951913 (patch) | |
tree | 779a1a6cf04dad09dee0828ad4ece0927de1b5f3 /.mailmap | |
parent | 61d97f4fcf73d30864a52373a34093be25be6a03 (diff) | |
parent | 7dc9719682ce8c46215bc9a1bdc7ee0c38ada94b (diff) |
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 '.mailmap')
0 files changed, 0 insertions, 0 deletions