Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa-current

Documentation/sound/alsa/ALSA-Configuration.txt

Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl

include/linux/pci_ids.h

include/sound/core.h

include/sound/cs46xx.h

include/sound/emu10k1.h

include/sound/pcm.h

include/sound/pcm_oss.h

include/sound/trident.h

include/sound/version.h

include/sound/ymfpci.h

sound/arm/Kconfig

sound/arm/aaci.c

sound/arm/sa11xx-uda1341.c

sound/core/Kconfig

sound/core/control.c

sound/core/control_compat.c

sound/core/device.c

sound/core/hwdep.c

sound/core/info.c