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>
|
||
|---|---|---|
| .. | ||
| acpi_pm.c | ||
| cyclone.c | ||
| Makefile | ||
| scx200_hrt.c | ||
| sh_cmt.c | ||
| tcb_clksrc.c | ||