Merge branch 'omap-for-v3.13/fixes-take4' into omap-for-v3.14/board-removal