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
..
bootp	ARM: 8153/1: Enable gcov support on the ARM architecture	2014-09-26 14:39:57 +01:00
compressed	Merge branches 'debug', 'fixes', 'l2c' (early part), 'misc' and 'sa1100' into for-next	2015-02-10 10:26:27 +00:00
dts	Merge branch 'omap/dt' into next/late	2015-04-15 21:41:13 +02:00
.gitignore
install.sh
Makefile