original_kernel/arch/ia64/sn/kernel
Ingo Molnar fc6fc7f1b1 Merge branch 'linus' into x86/apic
Conflicts:
	arch/x86/mach-default/setup.c

Semantic conflict resolution:
	arch/x86/kernel/setup.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-02-22 20:05:19 +01:00
..
sn2
Makefile
bte.c [IA64] bte_copy of BTE_MAX_XFER trips BUG_ON. 2009-02-19 11:29:31 -08:00
bte_error.c
huberror.c
idle.c
io_acpi_init.c PCI: return error on failure to read PCI ROMs 2009-02-04 16:58:41 -08:00
io_common.c
io_init.c PCI: return error on failure to read PCI ROMs 2009-02-04 16:58:41 -08:00
iomv.c
irq.c
klconflib.c
machvec.c
mca.c
msi_sn.c
pio_phys.S
setup.c
tiocx.c