Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa