Merge branch 'linus' into x86/x2apic
authorIngo Molnar <mingo@elte.hu>
Tue, 22 Jul 2008 07:06:21 +0000 (09:06 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 22 Jul 2008 07:06:21 +0000 (09:06 +0200)
commit76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b
tree3824e008db9d554229a70c85fbbc13238276bd7a
parent7be42004065ce4df193aeef5befd26805267d0d9
parent93ded9b8fd42abe2c3607097963d8de6ad9117eb
Merge branch 'linus' into x86/x2apic
16 files changed:
Documentation/kernel-parameters.txt
arch/x86/Kconfig
arch/x86/kernel/Makefile
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/apic_32.c
arch/x86/kernel/apic_64.c
arch/x86/kernel/cpu/common_64.c
arch/x86/kernel/mpparse.c
arch/x86/kernel/paravirt.c
arch/x86/kernel/setup.c
arch/x86/kernel/smpboot.c
arch/x86/xen/enlighten.c
drivers/pci/intel-iommu.c
include/asm-x86/apic.h
include/asm-x86/paravirt.h
include/asm-x86/smp.h