Merge branch 'tracking-omap-fixes-13.06' into merge-linux-linaro