Merge branch 'linus' into x86/x2apic

Conflicts:

	drivers/pci/dmar.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/genapic_flat_64.c
Simple merge

diff --cc arch/x86/kernel/genx2apic_uv_x.c
Simple merge

diff --cc arch/x86/kernel/io_apic_64.c
Simple merge

diff --cc arch/x86/kernel/paravirt.c
Simple merge

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc arch/x86/kernel/smpboot.c
Simple merge

diff --cc arch/x86/xen/enlighten.c
Simple merge

diff --cc include/asm-x86/ipi.h
Simple merge

diff --cc include/asm-x86/paravirt.h
Simple merge

diff --cc kernel/irq/manage.c
Simple merge