diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 15:11:10 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 15:11:10 +0100 |
| commit | 937b5991ca7717ceba99014f2ad3f51c85cdb9ad (patch) | |
| tree | 9cf8bf0a80fb176fa5166e288cf8e957a6469157 /drivers/net/bonding/bond_3ad.c | |
| parent | Merge tag 'sunxi-dt-for-3.15-2' of https://github.com/mripard/linux into next/dt (diff) | |
| parent | ARM: dts: Add MMC2/SDIO/WLAN support for cm-t3530 (diff) | |
| download | linux-937b5991ca7717ceba99014f2ad3f51c85cdb9ad.tar.xz linux-937b5991ca7717ceba99014f2ad3f51c85cdb9ad.zip | |
Merge tag 'omap-for-v3.15/dt-part3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Pull "omap device tree changes for v3.15, part 3" from Tony Lindgren:
Device tree related changes to the omap iommu driver as that
is finally getting updated. Also few trivial board related
.dts updates to add more devices.
* tag 'omap-for-v3.15/dt-part3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: Add MMC2/SDIO/WLAN support for cm-t3530
ARM: dts: am335x-evmsk: enable DMA controller for USB
ARM: dts: OMAP5: Add IOMMU nodes
ARM: dts: OMAP4: Add IOMMU nodes
ARM: dts: OMAP3: Add IVA IOMMU node
ARM: dts: OMAP3: Update ISP IOMMU node
ARM: OMAP2+: extend iommu pdata-quirks to OMAP5
ARM: OMAP5: hwmod data: add mmu data for ipu & dsp
ARM: OMAP2+: use pdata quirks for iommu reset lines
ARM: OMAP2+: change the ISP device archdata MMU name for DT
ARM: OMAP3: fix iva mmu programming issues
ARM: OMAP3: remove deprecated CONFIG_OMAP_IOMMU_IVA2
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/net/bonding/bond_3ad.c')
0 files changed, 0 insertions, 0 deletions