Merge branch 'devel' of git://git.alsa-project.org/alsa-kernel into topic/misc