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>
|
||
|---|---|---|
| .. | ||
| bitops | ||
| 4level-fixup.h | ||
| Kbuild | ||
| Kbuild.asm | ||
| atomic.h | ||
| audit_change_attr.h | ||
| audit_dir_write.h | ||
| audit_read.h | ||
| audit_signal.h | ||
| audit_write.h | ||
| bitops.h | ||
| bug.h | ||
| cmpxchg-local.h | ||
| cmpxchg.h | ||
| cputime.h | ||
| device.h | ||
| div64.h | ||
| dma-coherent.h | ||
| dma-mapping-broken.h | ||
| dma-mapping.h | ||
| emergency-restart.h | ||
| errno-base.h | ||
| errno.h | ||
| fcntl.h | ||
| futex.h | ||
| gpio.h | ||
| ide_iops.h | ||
| int-l64.h | ||
| int-ll64.h | ||
| ioctl.h | ||
| iomap.h | ||
| irq_regs.h | ||
| kdebug.h | ||
| libata-portmap.h | ||
| local.h | ||
| memory_model.h | ||
| mm_hooks.h | ||
| mman.h | ||
| mutex-dec.h | ||
| mutex-null.h | ||
| mutex-xchg.h | ||
| page.h | ||
| pci-dma-compat.h | ||
| pci.h | ||
| percpu.h | ||
| pgtable-nopmd.h | ||
| pgtable-nopud.h | ||
| pgtable.h | ||
| poll.h | ||
| resource.h | ||
| rtc.h | ||
| sections.h | ||
| siginfo.h | ||
| signal.h | ||
| statfs.h | ||
| syscall.h | ||
| termios.h | ||
| tlb.h | ||
| topology.h | ||
| uaccess.h | ||
| vmlinux.lds.h | ||
| xor.h | ||