Merge branch 'omap-for-v3.19/fixes-not-urgent' into omap-for-v3.19/fixes