mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
synced 2026-09-28 19:20:30 +00:00
Merge branch 'omap/dt' into next/late
As pointed out by Stephen Rothwell, commite52117638b("ARM: dts: omap3: Add DT entries for OMAP 3 ISP") conflicts withb8845074cf("ARM: dts: omap3: add minimal l4 bus layout with control module support") in non-obvious ways, causing a build failure when both patches are present. This merges the two branches that introduce the respective changes into the next/late branch to resolve the way that Stephen suggested, as confirmed by Tony. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Link: https://lkml.org/lkml/2015/4/6/436 Acked-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Arnd Bergmann
commit
30ecc84eea
39 changed files with 1565 additions and 70 deletions
Loading…
Add table
Add a link
Reference in a new issue