Ingo Molnar 1b8ba39a3f Merge branch 'x86/irq' into x86/devel ...

Conflicts:

	arch/x86/kernel/i8259.c
	arch/x86/kernel/irqinit_64.c

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

2008-07-08 09:53:57 +02:00

..

apm.h

x86: remove more bogus filenames in comments.

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

do_timer.h

i386/x86_64: move headers to include/asm-x86

2007-10-11 11:20:03 +02:00

entry_arch.h

i386/x86_64: move headers to include/asm-x86

2007-10-11 11:20:03 +02:00

mach_apic.h

x86: fix HT cpu booting on 32-bit

2008-04-30 23:15:35 +02:00

mach_apicdef.h

x86: fix smpboot integration

2008-04-17 17:41:21 +02:00

mach_ipi.h

x86: move ipi definitions to mach_ipi.h

2008-04-17 17:41:30 +02:00

mach_mpparse.h

x86: remove mpc_oem_bus_info()

2008-04-17 17:41:08 +02:00

mach_mpspec.h

i386/x86_64: move headers to include/asm-x86

2007-10-11 11:20:03 +02:00

mach_timer.h

x86: remove more bogus filenames in comments.

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

mach_traps.h

x86: remove more bogus filenames in comments.

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

mach_wakecpu.h

i386/x86_64: move headers to include/asm-x86

2007-10-11 11:20:03 +02:00

pci-functions.h

i386/x86_64: move headers to include/asm-x86

2007-10-11 11:20:03 +02:00

setup_arch.h

i386/x86_64: move headers to include/asm-x86

2007-10-11 11:20:03 +02:00

smpboot_hooks.h

x86: APIC/SMP: Downgrade the NMI watchdog for "noapic"

2008-07-08 09:13:20 +02:00