Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 7 Dec 2007 19:01:26 +0000 (11:01 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 7 Dec 2007 19:01:26 +0000 (11:01 -0800)
commit2c5ea0f2d8c7d4883dd0d8ec3c7e3f3640b4f814
treef6412441325195c16351822cff8da5f2ed5f1cfe
parentfa2dd441df28b9fdfc68f84ae66f1b507cfff0e4
parente17bcb43a26a7111f851b5ff6d1258ecd355de75
Merge git://git./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