Merge branch 'omap/fixes-for-3.1' into fixes