]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
* '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

1  2 
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/apic/io_apic.c
drivers/pci/intr_remapping.c
include/linux/dmar.h

Simple merge
Simple merge
Simple merge
Simple merge