Ingo Molnar 453c1404c5 Merge branch 'x86/apic' into x86/x2apic ... Conflicts: arch/x86/kernel/paravirt.c arch/x86/kernel/smpboot.c arch/x86/kernel/vmi_32.c arch/x86/lguest/boot.c arch/x86/xen/enlighten.c include/asm-x86/apic.h include/asm-x86/paravirt.h Signed-off-by: Ingo Molnar <mingo@elte.hu>		2008-07-18 23:00:05 +02:00
..
boot
configs
crypto
ia32
kernel	Merge branch 'x86/apic' into x86/x2apic	2008-07-18 23:00:05 +02:00
kvm
lguest	Merge branch 'x86/apic' into x86/x2apic	2008-07-18 23:00:05 +02:00
lib	Merge branch 'generic-ipi' into generic-ipi-for-linus	2008-07-15 21:55:59 +02:00
mach-default
mach-es7000
mach-generic
mach-rdc321x
mach-voyager	Merge branch 'generic-ipi' into generic-ipi-for-linus	2008-07-15 21:55:59 +02:00
math-emu
mm	Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-07-17 10:38:59 -07:00
oprofile	Merge branch 'generic-ipi' into generic-ipi-for-linus	2008-07-15 21:55:59 +02:00
pci	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2008-07-16 17:25:46 -07:00
power
vdso
video
xen	Merge branch 'x86/apic' into x86/x2apic	2008-07-18 23:00:05 +02:00
Kconfig	Merge branch 'linus' into x86/x2apic	2008-07-18 22:50:34 +02:00
Kconfig.cpu	x86: APIC: remove apic_write_around(); use alternatives	2008-07-18 12:51:21 +02:00
Kconfig.debug	x86: MMIOTRACE should not default to on	2008-07-14 15:03:25 -07:00
Makefile
Makefile_32.cpu