Merge branch 'omap-for-v3.17/mailbox' into omap-for-v3.17/soc omap-for-v3.17/soc-new
authorTony Lindgren <tony@atomide.com>
Wed, 23 Jul 2014 08:26:02 +0000 (01:26 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 23 Jul 2014 08:26:02 +0000 (01:26 -0700)
commit3965f5ba0489c01f419216c8909965b9a6a39388
treed2ef28248e014676cae80d0084a1c40557237bbd
parentecf4c7938fe10aabdb962187719911d345bc20b1
parentcbf14f3ab9bd6295b345fc812f08ddd844fb183e
Merge branch 'omap-for-v3.17/mailbox' into omap-for-v3.17/soc
arch/arm/boot/dts/dra7.dtsi
arch/arm/boot/dts/omap5.dtsi
arch/arm/mach-omap2/omap_hwmod_7xx_data.c