Merge branch 'dts-crossbar' into omap-for-v3.17/dt