Merge remote-tracking branch 'asoc/topic/omap' into for-3.7