6e15cf0486
Conflicts: arch/parisc/kernel/irq.c arch/x86/include/asm/fixmap_64.h arch/x86/include/asm/setup.h kernel/irq/handle.c Semantic merge: arch/x86/include/asm/fixmap.h Signed-off-by: Ingo Molnar <mingo@elte.hu> |
||
---|---|---|
.. | ||
.gitignore | ||
Kconfig | ||
Makefile | ||
eisa-bus.c | ||
eisa.ids | ||
pci_eisa.c | ||
virtual_root.c |