Merge branch 'linus' into x86/apic
Pull in upstream changes to avoid conflicts
Showing
- .mailmap 4 additions, 1 deletion.mailmap
- Documentation/ABI/testing/sysfs-bus-iio 2 additions, 4 deletionsDocumentation/ABI/testing/sysfs-bus-iio
- Documentation/DocBook/drm.tmpl 1 addition, 1 deletionDocumentation/DocBook/drm.tmpl
- Documentation/arm/SPEAr/overview.txt 1 addition, 1 deletionDocumentation/arm/SPEAr/overview.txt
- Documentation/device-mapper/cache.txt 6 additions, 0 deletionsDocumentation/device-mapper/cache.txt
- Documentation/device-mapper/thin-provisioning.txt 8 additions, 1 deletionDocumentation/device-mapper/thin-provisioning.txt
- Documentation/devicetree/bindings/drm/imx/fsl-imx-drm.txt 24 additions, 2 deletionsDocumentation/devicetree/bindings/drm/imx/fsl-imx-drm.txt
- Documentation/devicetree/bindings/iommu/arm,smmu-v3.txt 3 additions, 0 deletionsDocumentation/devicetree/bindings/iommu/arm,smmu-v3.txt
- Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt 0 additions, 2 deletionsDocumentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
- Documentation/kbuild/makefiles.txt 8 additions, 0 deletionsDocumentation/kbuild/makefiles.txt
- MAINTAINERS 72 additions, 55 deletionsMAINTAINERS
- Makefile 6 additions, 5 deletionsMakefile
- arch/Kconfig 4 additions, 0 deletionsarch/Kconfig
- arch/alpha/include/asm/Kbuild 1 addition, 0 deletionsarch/alpha/include/asm/Kbuild
- arch/alpha/include/asm/mm-arch-hooks.h 0 additions, 15 deletionsarch/alpha/include/asm/mm-arch-hooks.h
- arch/arc/Kconfig 2 additions, 1 deletionarch/arc/Kconfig
- arch/arc/Makefile 2 additions, 1 deletionarch/arc/Makefile
- arch/arc/boot/dts/axc003.dtsi 1 addition, 1 deletionarch/arc/boot/dts/axc003.dtsi
- arch/arc/boot/dts/axc003_idu.dtsi 1 addition, 1 deletionarch/arc/boot/dts/axc003_idu.dtsi
- arch/arc/include/asm/Kbuild 1 addition, 0 deletionsarch/arc/include/asm/Kbuild
Please register or sign in to comment