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