diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-12 05:01:33 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-12 05:01:33 +0100 |
commit | 1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf (patch) | |
tree | d2073d669e6eaf15ece6fc6ce563438d74824412 /drivers/acpi/acpi_pad.c | |
parent | Merge branch 'x86-nuke386-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
parent | x86: hpet: Fix inverted return value check in arch_setup_hpet_msi() (diff) | |
download | linux-1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf.tar.xz linux-1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf.zip |
Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 timer update from Ingo Molnar:
"This tree includes HPET fixes and also implements a calibration-free,
TSC match driven APIC timer interrupt mode: 'TSC deadline mode'
supported in SandyBridge and later CPUs."
* 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: hpet: Fix inverted return value check in arch_setup_hpet_msi()
x86: hpet: Fix masking of MSI interrupts
x86: apic: Use tsc deadline for oneshot when available
Diffstat (limited to 'drivers/acpi/acpi_pad.c')
0 files changed, 0 insertions, 0 deletions