fc6fc7f1b1
Conflicts: arch/x86/mach-default/setup.c Semantic conflict resolution: arch/x86/kernel/setup.c Signed-off-by: Ingo Molnar <mingo@elte.hu> |
||
---|---|---|
.. | ||
sn2 | ||
bte_error.c | ||
bte.c | ||
huberror.c | ||
idle.c | ||
io_acpi_init.c | ||
io_common.c | ||
io_init.c | ||
iomv.c | ||
irq.c | ||
klconflib.c | ||
machvec.c | ||
Makefile | ||
mca.c | ||
msi_sn.c | ||
pio_phys.S | ||
setup.c | ||
tiocx.c |