Merge branch 'topic/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Sun, 22 May 2011 08:01:29 +0000 (10:01 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sun, 22 May 2011 08:01:29 +0000 (10:01 +0200)
commit02e5fbf622aabf68bdc02282a17a3aeed054237a
tree60f2d4e09464dbf338c832bb39f861f29779b86b
parentb759b3ac9aee3afb01c21b603970ebb200c8048e
parentbfe9fc8aebc997ce8bcf8ac0586c84a247812064
Merge branch 'topic/misc' into for-linus
14 files changed:
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