Merge branch 'topic/misc' into for-linus
Takashi Iwai [Sun, 22 May 2011 08:01:29 +0000 (10:01 +0200)]
14 files changed:
1  2 
MAINTAINERS
include/sound/control.h
sound/pci/Kconfig
sound/pci/asihpi/asihpi.c
sound/pci/asihpi/hpi6000.c
sound/pci/asihpi/hpi6205.c
sound/pci/asihpi/hpi_internal.h
sound/pci/asihpi/hpimsgx.c
sound/pci/au88x0/au88x0_pcm.c
sound/pci/intel8x0m.c
sound/usb/6fire/firmware.c
sound/usb/format.c
sound/usb/mixer.c
sound/usb/quirks.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge