Merge tag 'omap-for-v3.10/fixes-for-merge-window' of git://git.kernel.org/pub/scm...