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 | ||
| empty.c | ||
| file2alias.c | ||
| Makefile | ||
| mk_elfconfig.c | ||
| modpost.c | ||
| modpost.h | ||
| sumversion.c | ||