Merge branch 'linus' into x86/x2apic
authorIngo Molnar <mingo@elte.hu>
Fri, 25 Jul 2008 11:08:16 +0000 (13:08 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 25 Jul 2008 11:08:16 +0000 (13:08 +0200)
commit10a010f6953b5a14ba2f0be40a4fce1bea220875
tree19aadf718c796bc7fae0a1a1c970d84d67c541d4
parent510b37258dfd61693ca6c039865c78bd996e3718
parentfb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43
Merge branch 'linus' into x86/x2apic

Conflicts:

drivers/pci/dmar.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
12 files changed:
Documentation/kernel-parameters.txt
arch/x86/Kconfig
arch/x86/kernel/genapic_flat_64.c
arch/x86/kernel/genx2apic_uv_x.c
arch/x86/kernel/io_apic_64.c
arch/x86/kernel/paravirt.c
arch/x86/kernel/setup.c
arch/x86/kernel/smpboot.c
arch/x86/xen/enlighten.c
include/asm-x86/ipi.h
include/asm-x86/paravirt.h
kernel/irq/manage.c