Merge branches 'asoc-twl6040' and 'asoc-omap' into for-3.7