Merge branch 'omap-for-v3.17/mailbox' into omap-for-v3.17/soc
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)
1  2 
arch/arm/boot/dts/dra7.dtsi
arch/arm/boot/dts/omap5.dtsi
arch/arm/mach-omap2/omap_hwmod_7xx_data.c

Simple merge
Simple merge