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>
|
||
|---|---|---|
| .. | ||
| autoprobe.c | ||
| chip.c | ||
| devres.c | ||
| handle.c | ||
| internals.h | ||
| Makefile | ||
| manage.c | ||
| migration.c | ||
| numa_migrate.c | ||
| proc.c | ||
| resend.c | ||
| spurious.c | ||