diff options
| author |   Olof Johansson <olof@lixom.net> | 2020-01-07 11:22:43 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-01-07 11:22:43 -0800 |
| commit | 785ca50f8e616b27417436fac517687a81fff5b0 (patch) | |
| tree | 0ae3a171440fa7f5884655c92e3db6de548927ce /drivers/net/netdevsim/git:/ssh:/git@git.zx2c4.com | |
| parent | Merge tag 'omap-for-v5.6/ti-sysc-dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt (diff) | |
| parent | ARM: OMAP2+: use separate IOMMU pdata to fix DRA7 IPU1 boot (diff) | |
Merge branch 'omap/soc' into arm/dt
Bringing in to resolve soc -> add/add conflicts locally
* omap/soc:
ARM: OMAP2+: use separate IOMMU pdata to fix DRA7 IPU1 boot
ARM: OMAP2+: omap-iommu.c conversion to ti-sysc
ARM: OMAP2+: Add workaround for DRA7 DSP MStandby errata i879
ARM: OMAP4+: remove pdata quirks for omap4+ iommus
ARM: OMAP2+: pdata-quirks: add PRM data for reset support
ARM: OMAP2+: am43xx: Add lcdc clockdomain
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/net/netdevsim/git:/ssh:/git@git.zx2c4.com')
0 files changed, 0 insertions, 0 deletions