Merge http://www.kernel.org/pub/scm/linux/kernel/git/perex/alsa