Merge commit 'alsa/master' into for-linus