commit | 2c5ea0f2d8c7d4883dd0d8ec3c7e3f3640b4f814 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Dec 07 11:01:26 2007 -0800 |
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Dec 07 11:01:26 2007 -0800 |
tree | f6412441325195c16351822cff8da5f2ed5f1cfe | |
parent | fa2dd441df28b9fdfc68f84ae66f1b507cfff0e4 [diff] | |
parent | e17bcb43a26a7111f851b5ff6d1258ecd355de75 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 * git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: ACPI: move timer broadcast before busmaster disable clockevents: warn once when program_event() is called with negative expiry hrtimers: avoid overflow for large relative timeouts