Arnd Bergmann 30ecc84eea Merge branch 'omap/dt' into next/late ... As pointed out by Stephen Rothwell, commit e52117638b ("ARM: dts: omap3: Add DT entries for OMAP 3 ISP") conflicts with b8845074cf ("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>		2015-04-15 21:41:13 +02:00
..
bindings	Merge branch 'omap/dt' into next/late	2015-04-15 21:41:13 +02:00
00-INDEX
booting-without-of.txt	dt/documentation: add specification of dma bus information	2014-09-26 11:18:05 -05:00
changesets.txt
dynamic-resolution-notes.txt	of: Introduce Device Tree resolve support.	2014-10-04 21:24:26 +01:00
of_selftest.txt	of: Eliminate of_allnodes list	2014-11-04 13:29:38 +00:00
overlay-notes.txt	Documentation: devicetree: Fix double words in Doumentation/devicetree	2015-01-28 15:13:11 -07:00
todo.txt	of: Eliminate of_allnodes list	2014-11-04 13:29:38 +00:00
usage-model.txt