As pointed out by Stephen Rothwell, commit e5211763 ("ARM: dts:
omap3: Add DT entries for OMAP 3 ISP") conflicts with b8845074
("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/436Acked-by: Tony Lindgren <tony@atomide.com>