Merge branch 'cpus4096' into irq/threaded
Conflicts:
arch/parisc/kernel/irq.c
kernel/irq/handle.c
Signed-off-by: 
Thomas Gleixner <tglx@linutronix.de>
Showing
- Documentation/cputopology.txt 3 additions, 3 deletionsDocumentation/cputopology.txt
- Documentation/kernel-parameters.txt 6 additions, 1 deletionDocumentation/kernel-parameters.txt
- Documentation/x86/boot.txt 11 additions, 7 deletionsDocumentation/x86/boot.txt
- Documentation/x86/earlyprintk.txt 101 additions, 0 deletionsDocumentation/x86/earlyprintk.txt
- Makefile 2 additions, 1 deletionMakefile
- arch/alpha/include/asm/statfs.h 2 additions, 0 deletionsarch/alpha/include/asm/statfs.h
- arch/alpha/include/asm/swab.h 1 addition, 1 deletionarch/alpha/include/asm/swab.h
- arch/alpha/kernel/irq.c 1 addition, 1 deletionarch/alpha/kernel/irq.c
- arch/alpha/mm/init.c 13 additions, 7 deletionsarch/alpha/mm/init.c
- arch/arm/include/asm/a.out.h 1 addition, 1 deletionarch/arm/include/asm/a.out.h
- arch/arm/include/asm/setup.h 1 addition, 1 deletionarch/arm/include/asm/setup.h
- arch/arm/include/asm/swab.h 1 addition, 1 deletionarch/arm/include/asm/swab.h
- arch/arm/kernel/irq.c 12 additions, 6 deletionsarch/arm/kernel/irq.c
- arch/arm/kernel/vmlinux.lds.S 1 addition, 0 deletionsarch/arm/kernel/vmlinux.lds.S
- arch/arm/oprofile/op_model_mpcore.c 1 addition, 1 deletionarch/arm/oprofile/op_model_mpcore.c
- arch/avr32/Kconfig 1 addition, 1 deletionarch/avr32/Kconfig
- arch/avr32/include/asm/swab.h 1 addition, 1 deletionarch/avr32/include/asm/swab.h
- arch/blackfin/include/asm/percpu.h 0 additions, 10 deletionsarch/blackfin/include/asm/percpu.h
- arch/blackfin/include/asm/swab.h 1 addition, 1 deletionarch/blackfin/include/asm/swab.h
- arch/blackfin/kernel/irqchip.c 5 additions, 0 deletionsarch/blackfin/kernel/irqchip.c
Please register or sign in to comment