Merge branch 'x86/cleanups' into x86/trampoline
authorH. Peter Anvin <hpa@linux.intel.com>
Wed, 20 Oct 2010 21:22:45 +0000 (14:22 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Wed, 20 Oct 2010 21:22:45 +0000 (14:22 -0700)
commitd25e6b0b326278a1096e8334584c3e64517057a3
tree3c914b877adf9615c7158b58705478e56c9b4247
parente44dea35ccb78ab7dc3a75ccec71d7d6f35017c4
parent40ffa93791985ab300fd488072e9f37ccf72e88c
Merge branch 'x86/cleanups' into x86/trampoline
arch/x86/kernel/Makefile
arch/x86/kernel/apic/io_apic.c
arch/x86/kernel/cpu/amd.c
arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/early-quirks.c
arch/x86/kernel/setup.c