From: Arnd Bergmann Date: Wed, 15 Apr 2015 19:35:22 +0000 (+0200) Subject: Merge branch 'omap/dt' into next/late X-Git-Tag: omap-for-v4.2/o2_dc~48^2~1 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30ecc84eea691cfb0b731d71839bdcba88df5f75;p=pandora-kernel.git Merge branch 'omap/dt' into next/late As pointed out by Stephen Rothwell, commit e52117638b79 ("ARM: dts: omap3: Add DT entries for OMAP 3 ISP") conflicts with b8845074cfbb ("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 Link: https://lkml.org/lkml/2015/4/6/436 Acked-by: Tony Lindgren --- 30ecc84eea691cfb0b731d71839bdcba88df5f75 Reading git-diff-tree failed