Ingo Molnar 1a781a777b Merge branch 'generic-ipi' into generic-ipi-for-linus ...

Conflicts:

	arch/powerpc/Kconfig
	arch/s390/kernel/time.c
	arch/x86/kernel/apic_32.c
	arch/x86/kernel/cpu/perfctr-watchdog.c
	arch/x86/kernel/i8259_64.c
	arch/x86/kernel/ldt.c
	arch/x86/kernel/nmi_64.c
	arch/x86/kernel/smpboot.c
	arch/x86/xen/smp.c
	include/asm-x86/hw_irq_32.h
	include/asm-x86/hw_irq_64.h
	include/asm-x86/mach-default/irq_vectors.h
	include/asm-x86/mach-voyager/irq_vectors.h
	include/asm-x86/smp.h
	kernel/Makefile

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

2008-07-15 21:55:59 +02:00

..

amd.c

x86: mtrr use type bool [RESEND AGAIN]

2008-01-30 13:30:31 +01:00

centaur.c

i386: move kernel/cpu/mtrr

2007-10-11 11:16:28 +02:00

cyrix.c

x86: remove long dead cyrix mtrr code

2008-02-04 16:48:01 +01:00

generic.c

x86: amd opteron TOM2 mask val fix

2008-05-25 10:55:10 +02:00

if.c

proc: remove proc_root from drivers

2008-04-29 08:06:18 -07:00

main.c

Merge branch 'generic-ipi' into generic-ipi-for-linus

2008-07-15 21:55:59 +02:00

Makefile

i386: move kernel/cpu/mtrr

2007-10-11 11:16:28 +02:00

mtrr.h

x86: mtrr cleanup for converting continuous to discrete layout, v8

2008-05-25 10:55:09 +02:00

state.c

x86: coding style fixes to arch/x86/kernel/cpu/mtrr/state.c

2008-04-17 17:40:49 +02:00