Merge branch 'topic/misc' into for-linus

diff --cc MAINTAINERS
Simple merge

diff --cc include/sound/control.h
Simple merge

diff --cc sound/pci/Kconfig
Simple merge

diff --cc sound/pci/asihpi/asihpi.c
Simple merge

diff --cc sound/pci/asihpi/hpi6000.c
Simple merge

diff --cc sound/pci/asihpi/hpi6205.c
Simple merge

diff --cc sound/pci/asihpi/hpi_internal.h
Simple merge

diff --cc sound/pci/asihpi/hpimsgx.c
Simple merge

diff --cc sound/pci/au88x0/au88x0_pcm.c
Simple merge

diff --cc sound/pci/intel8x0m.c
Simple merge

diff --cc sound/usb/6fire/firmware.c
Simple merge

diff --cc sound/usb/format.c
Simple merge

diff --cc sound/usb/mixer.c
Simple merge

diff --cc sound/usb/quirks.c
Simple merge