Merge remote-tracking branch 'tip/x86/urgent' into efi-for-mingo
Conflicts: arch/x86/include/asm/efi.h
Showing
- Documentation/ABI/testing/sysfs-tty 1 addition, 2 deletionsDocumentation/ABI/testing/sysfs-tty
- Documentation/PCI/MSI-HOWTO.txt 109 additions, 10 deletionsDocumentation/PCI/MSI-HOWTO.txt
- Documentation/devicetree/bindings/arm/omap/omap.txt 1 addition, 1 deletionDocumentation/devicetree/bindings/arm/omap/omap.txt
- Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt 10 additions, 6 deletionsDocumentation/devicetree/bindings/dma/fsl-imx-sdma.txt
- Documentation/devicetree/bindings/net/sti-dwmac.txt 58 additions, 0 deletionsDocumentation/devicetree/bindings/net/sti-dwmac.txt
- Documentation/networking/3c505.txt 0 additions, 45 deletionsDocumentation/networking/3c505.txt
- MAINTAINERS 34 additions, 6 deletionsMAINTAINERS
- Makefile 6 additions, 4 deletionsMakefile
- arch/arm/boot/dts/Makefile 2 additions, 1 deletionarch/arm/boot/dts/Makefile
- arch/arm/boot/dts/am335x-evmsk.dts 10 additions, 1 deletionarch/arm/boot/dts/am335x-evmsk.dts
- arch/arm/boot/dts/armada-xp-mv78260.dtsi 2 additions, 1 deletionarch/arm/boot/dts/armada-xp-mv78260.dtsi
- arch/arm/boot/dts/dove.dtsi 0 additions, 11 deletionsarch/arm/boot/dts/dove.dtsi
- arch/arm/boot/dts/imx6dl-hummingboard.dts 3 additions, 7 deletionsarch/arm/boot/dts/imx6dl-hummingboard.dts
- arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 3 additions, 7 deletionsarch/arm/boot/dts/imx6qdl-cubox-i.dtsi
- arch/arm/boot/dts/omap3-gta04.dts 4 additions, 2 deletionsarch/arm/boot/dts/omap3-gta04.dts
- arch/arm/boot/dts/omap3-n9.dts 1 addition, 1 deletionarch/arm/boot/dts/omap3-n9.dts
- arch/arm/boot/dts/omap3-n900.dts 2 additions, 2 deletionsarch/arm/boot/dts/omap3-n900.dts
- arch/arm/boot/dts/omap3-n950.dts 1 addition, 1 deletionarch/arm/boot/dts/omap3-n950.dts
- arch/arm/boot/dts/omap3-overo-storm-tobi.dts 22 additions, 0 deletionsarch/arm/boot/dts/omap3-overo-storm-tobi.dts
- arch/arm/boot/dts/omap3-overo-tobi-common.dtsi 0 additions, 3 deletionsarch/arm/boot/dts/omap3-overo-tobi-common.dtsi
Loading
Please register or sign in to comment