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>
|
||
|---|---|---|
| .. | ||
| boot | ||
| configs | ||
| kernel | ||
| lib | ||
| mm | ||
| oprofile | ||
| proc-mn103e010 | ||
| unit-asb2303 | ||
| unit-asb2305 | ||
| Kconfig | ||
| Kconfig.debug | ||
| Makefile | ||