tree f6412441325195c16351822cff8da5f2ed5f1cfe
parent fa2dd441df28b9fdfc68f84ae66f1b507cfff0e4
parent e17bcb43a26a7111f851b5ff6d1258ecd355de75
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1197054086 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1197054086 -0800

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