aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/include/asm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-09 10:38:23 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-09 10:38:23 -0700
commite66dd19092497f566e4dda1664688e28fa667265 (patch)
tree57876e6c8c2a2b3701b0b5d666593f5428dc3514 /arch/x86/include/asm
parentc2ea122cd7c4a094be71641f3961796398035513 (diff)
parentf20ab9c38fb85b4dde8b4139788ab9e735a35279 (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/asm')
-rw-r--r--[-rwxr-xr-x]arch/x86/include/asm/cpu_debug.h0
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 222802029fa..222802029fa 100755..100644
--- a/arch/x86/include/asm/cpu_debug.h
+++ b/arch/x86/include/asm/cpu_debug.h