Merge tag 'v3.8-rc5' into x86/mm
authorH. Peter Anvin <hpa@linux.intel.com>
Sat, 26 Jan 2013 00:31:21 +0000 (16:31 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Sat, 26 Jan 2013 00:31:21 +0000 (16:31 -0800)
commit7b5c4a65cc27f017c170b025f8d6d75dabb11c6f
tree05deacbc66a9f5c27147a6ea975211ae82281044
parent3596f5bb0a6afd01a784bfe120f420edbbf82861
parent949db153b6466c6f7cad5a427ecea94985927311
Merge tag 'v3.8-rc5' into x86/mm

The __pa() fixup series that follows touches KVM code that is not
present in the existing branch based on v3.7-rc5, so merge in the
current upstream from Linus.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
arch/x86/kernel/acpi/sleep.c
arch/x86/kernel/apic/apic_numachip.c
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/setup.c
arch/x86/lguest/boot.c
arch/x86/mm/init_64.c
arch/x86/mm/pgtable.c