diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-09 13:38:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-09 13:38:23 -0400 |
| commit | e66dd19092497f566e4dda1664688e28fa667265 (patch) | |
| tree | 57876e6c8c2a2b3701b0b5d666593f5428dc3514 /arch/x86/include | |
| parent | c2ea122cd7c4a094be71641f3961796398035513 (diff) | |
| parent | f20ab9c38fb85b4dde8b4139788ab9e735a35279 (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: cpu_debug remove execute permission
x86: smarten /proc/interrupts output for new counters
x86: DMI match for the Dell DXP061 as it needs BIOS reboot
x86: make 64 bit to use default_inquire_remote_apic
x86, setup: un-resequence mode setting for VGA 80x34 and 80x60 modes
x86, intel-iommu: fix X2APIC && !ACPI build failure
Diffstat (limited to 'arch/x86/include')
| -rw-r--r--[-rwxr-xr-x] | arch/x86/include/asm/cpu_debug.h | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/arch/x86/include/asm/cpu_debug.h b/arch/x86/include/asm/cpu_debug.h index 222802029fa6..222802029fa6 100755..100644 --- a/arch/x86/include/asm/cpu_debug.h +++ b/arch/x86/include/asm/cpu_debug.h | |||