Merge tag 'v4.0-rc7' into x86/asm, to resolve conflicts
Conflicts:
arch/x86/kernel/entry_64.S
Signed-off-by: 
Ingo Molnar <mingo@kernel.org>
Showing
- Documentation/devicetree/bindings/net/dsa/dsa.txt 3 additions, 1 deletionDocumentation/devicetree/bindings/net/dsa/dsa.txt
- Documentation/input/alps.txt 8 additions, 0 deletionsDocumentation/input/alps.txt
- Documentation/input/event-codes.txt 6 additions, 0 deletionsDocumentation/input/event-codes.txt
- Documentation/input/multi-touch-protocol.txt 6 additions, 3 deletionsDocumentation/input/multi-touch-protocol.txt
- MAINTAINERS 25 additions, 19 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/arc/kernel/signal.c 18 additions, 6 deletionsarch/arc/kernel/signal.c
- arch/arm/Kconfig 1 addition, 0 deletionsarch/arm/Kconfig
- arch/arm/boot/dts/dm8168-evm.dts 19 additions, 0 deletionsarch/arm/boot/dts/dm8168-evm.dts
- arch/arm/boot/dts/dm816x.dtsi 14 additions, 4 deletionsarch/arm/boot/dts/dm816x.dtsi
- arch/arm/boot/dts/dra7.dtsi 0 additions, 2 deletionsarch/arm/boot/dts/dra7.dtsi
- arch/arm/boot/dts/omap3.dtsi 4 additions, 0 deletionsarch/arm/boot/dts/omap3.dtsi
- arch/arm/boot/dts/rk3288.dtsi 1 addition, 0 deletionsarch/arm/boot/dts/rk3288.dtsi
- arch/arm/boot/dts/socfpga.dtsi 1 addition, 1 deletionarch/arm/boot/dts/socfpga.dtsi
- arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts 16 additions, 0 deletionsarch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
- arch/arm/boot/dts/sun4i-a10.dtsi 1 addition, 2 deletionsarch/arm/boot/dts/sun4i-a10.dtsi
- arch/arm/boot/dts/sun5i-a13.dtsi 1 addition, 2 deletionsarch/arm/boot/dts/sun5i-a13.dtsi
- arch/arm/boot/dts/sun7i-a20.dtsi 1 addition, 2 deletionsarch/arm/boot/dts/sun7i-a20.dtsi
- arch/arm/mach-omap2/id.c 2 additions, 0 deletionsarch/arm/mach-omap2/id.c
- arch/arm/mach-pxa/irq.c 48 additions, 63 deletionsarch/arm/mach-pxa/irq.c
Please register or sign in to comment