Merge branches 'devel-iommu-mailbox' and 'devel-l2x0' into omap-for-linus
Showing
- arch/arm/include/asm/hardware/cache-l2x0.h 11 additions, 1 deletionarch/arm/include/asm/hardware/cache-l2x0.h
- arch/arm/include/asm/io.h 5 additions, 8 deletionsarch/arm/include/asm/io.h
- arch/arm/mach-davinci/include/mach/io.h 2 additions, 2 deletionsarch/arm/mach-davinci/include/mach/io.h
- arch/arm/mach-iop13xx/include/mach/io.h 2 additions, 2 deletionsarch/arm/mach-iop13xx/include/mach/io.h
- arch/arm/mach-iop32x/include/mach/io.h 2 additions, 2 deletionsarch/arm/mach-iop32x/include/mach/io.h
- arch/arm/mach-iop33x/include/mach/io.h 2 additions, 2 deletionsarch/arm/mach-iop33x/include/mach/io.h
- arch/arm/mach-ixp23xx/include/mach/io.h 2 additions, 2 deletionsarch/arm/mach-ixp23xx/include/mach/io.h
- arch/arm/mach-ixp4xx/include/mach/io.h 2 additions, 2 deletionsarch/arm/mach-ixp4xx/include/mach/io.h
- arch/arm/mach-kirkwood/include/mach/io.h 2 additions, 2 deletionsarch/arm/mach-kirkwood/include/mach/io.h
- arch/arm/mach-omap2/mailbox.c 11 additions, 8 deletionsarch/arm/mach-omap2/mailbox.c
- arch/arm/mach-omap2/omap-iommu.c 9 additions, 1 deletionarch/arm/mach-omap2/omap-iommu.c
- arch/arm/mach-omap2/omap4-common.c 23 additions, 7 deletionsarch/arm/mach-omap2/omap4-common.c
- arch/arm/mach-orion5x/include/mach/io.h 2 additions, 2 deletionsarch/arm/mach-orion5x/include/mach/io.h
- arch/arm/mach-tegra/include/mach/io.h 2 additions, 2 deletionsarch/arm/mach-tegra/include/mach/io.h
- arch/arm/plat-omap/Kconfig 3 additions, 0 deletionsarch/arm/plat-omap/Kconfig
- arch/arm/plat-omap/include/plat/io.h 2 additions, 2 deletionsarch/arm/plat-omap/include/plat/io.h
- arch/arm/plat-omap/include/plat/iommu.h 5 additions, 0 deletionsarch/arm/plat-omap/include/plat/iommu.h
- arch/arm/plat-omap/include/plat/mailbox.h 5 additions, 3 deletionsarch/arm/plat-omap/include/plat/mailbox.h
- arch/arm/plat-omap/iommu.c 24 additions, 0 deletionsarch/arm/plat-omap/iommu.c
- arch/arm/plat-omap/iovmm.c 46 additions, 35 deletionsarch/arm/plat-omap/iovmm.c
Loading
Please register or sign in to comment