Merge branch 'timers-for-linus-hpet' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Dec 2009 03:26:55 +0000 (19:26 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Dec 2009 03:26:55 +0000 (19:26 -0800)
commit849e8dea099aafa56db9e74b580b0d858b956533
treef97331389507608561e96e96a04546b84a8860fc
parente069efb6bbf8f739a2e084183709b5eb76abf90d
parent18ed61da985c57eea3fe8038b13fa2837c9b3c3f
Merge branch 'timers-for-linus-hpet' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'timers-for-linus-hpet' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: hpet: Make WARN_ON understandable
  x86: arch specific support for remapping HPET MSIs
  intr-remap: generic support for remapping HPET MSIs
  x86, hpet: Simplify the HPET code
  x86, hpet: Disable per-cpu hpet timer if ARAT is supported
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/apic/io_apic.c
drivers/pci/intr_remapping.c
include/linux/dmar.h