Merge branch 'asoc-omap' into for-3.7