Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'arm/smmu', 'arm/tegra' and 'core' into next
Conflicts: drivers/iommu/amd_iommu.c drivers/iommu/tegra-gart.c drivers/iommu/tegra-smmu.c
No related branches found
No related tags found
Showing
- MAINTAINERS 11 additions, 3 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
- arch/arm/mach-pxa/zeus.c 1 addition, 1 deletionarch/arm/mach-pxa/zeus.c
- arch/arm/mach-sunxi/Kconfig 2 additions, 6 deletionsarch/arm/mach-sunxi/Kconfig
- arch/arm/plat-omap/dmtimer.c 14 additions, 1 deletionarch/arm/plat-omap/dmtimer.c
- arch/arm64/boot/dts/arm/juno-clocks.dtsi 1 addition, 1 deletionarch/arm64/boot/dts/arm/juno-clocks.dtsi
Loading
Please register or sign in to comment