Merge branch 'omap-for-v3.17/dt' into omap-for-v3.18/dt
authorTony Lindgren <tony@atomide.com>
Wed, 3 Sep 2014 22:30:29 +0000 (15:30 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 3 Sep 2014 22:30:29 +0000 (15:30 -0700)
Merge the gta04 related changes that were too late for v3.17

1  2 
arch/arm/boot/dts/Makefile

Simple merge