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)
commitfbe1d5b00daabfa5313685c87ac8632a77aeb31d
treeb9f626debc89c14fb9a96fa3d5955657fd8515c8
parent69e273c0b0a3c337a521d083374c918dc52c666f
parentc9940680b599300c3fb46e799986b736d394432d
Merge branch 'omap-for-v3.17/dt' into omap-for-v3.18/dt

Merge the gta04 related changes that were too late for v3.17
arch/arm/boot/dts/Makefile