From: Linus Torvalds Date: Fri, 7 Dec 2007 19:01:26 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 X-Git-Tag: v2.6.24-rc5~49 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2c5ea0f2d8c7d4883dd0d8ec3c7e3f3640b4f814;p=linux-2.6-omap-h63xx.git 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 --- 2c5ea0f2d8c7d4883dd0d8ec3c7e3f3640b4f814