Merge tag 'omap-for-v3.13/more-fixes-for-merge-window-take2' of git://git.kernel...