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>
|
||
|---|---|---|
| .. | ||
| mpu401 | ||
| opl3 | ||
| opl4 | ||
| pcsp | ||
| vx | ||
| dummy.c | ||
| Kconfig | ||
| Makefile | ||
| ml403-ac97cr.c | ||
| mtpav.c | ||
| mts64.c | ||
| pcm-indirect2.c | ||
| pcm-indirect2.h | ||
| portman2x4.c | ||
| serial-u16550.c | ||
| virmidi.c | ||