Linus Torvalds 52b0ace7df Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (26 commits) ALSA: snd-usb-caiaq: Bump version number to 1.3.21 ALSA: Revert "ALSA: snd-usb-caiaq: Set default input mode of A4DJ" ALSA: snd-usb-caiaq: Simplify single case to an 'if' ALSA: snd-usb-caiaq: Restore 'Control vinyl' input mode on A4DJ ALSA: hda: Use LPIB for a Shuttle device ALSA: hda: Add support for another Lenovo ThinkPad Edge in conexant codec ALSA: hda: Use LPIB for Sony VPCS11V9E ALSA: usb-audio: fix feature unit parser for UAC2 ALSA: asihpi - Minor code cleanup ALSA: asihpi - Add support for new ASI8800 family ALSA: asihpi - Fix bug preventing outstream_write preload from happening ALSA: asihpi - Fix imbalanced lock path in hw_message ALSA: asihpi - Remove support for old ASI8800 family ALSA: asihpi - Add hd radio blend functions ALSA: asihpi - Remove unused io map functions ALSA: usb-audio: add support for UAC2 pitch control ALSA: usb-audio: parse UAC2 endpoint descriptors correctly ALSA: usb-audio: fix return values ALSA: usb-audio: parse more format descriptors with structs sound: Add missing spin_unlock ...		2010-05-29 15:31:57 -07:00
..
caiaq	ALSA: snd-usb-caiaq: Bump version number to 1.3.21	2010-05-29 21:49:11 +02:00
misc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
usx2y	Merge branch 'topic/usb' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into devel	2010-04-16 10:37:41 +02:00
Kconfig	Merge remote branch 'alsa/devel' into topic/usb	2010-03-23 14:56:33 +01:00
Makefile	ALSA: usbmixer: rename usbmixer.[ch] -> mixer.[ch]	2010-03-12 12:20:49 +01:00
card.c	ALSA: usb: fix usb build error when PM is not enabled	2010-03-22 17:07:36 +01:00
card.h	ALSA: usb-audio: use a format bitmask per alternate setting	2010-03-05 08:18:32 +01:00
debug.h	ALSA: usb-audio: refactor code	2010-03-05 08:17:14 +01:00
endpoint.c	ALSA: usb-audio: parse UAC2 endpoint descriptors correctly	2010-05-27 09:49:22 +02:00
endpoint.h	ALSA: usb-audio: refactor code	2010-03-05 08:17:14 +01:00
format.c	ALSA: usb-audio: fix return values	2010-05-27 09:48:47 +02:00
format.h	ALSA: usb-audio: parse more format descriptors with structs	2010-05-27 09:48:31 +02:00
helper.c	ALSA: usb - use of kmalloc/kfree requires the include of slab.h	2010-03-29 08:23:27 +02:00
helper.h	ALSA: usb-audio: refactor code	2010-03-05 08:17:14 +01:00
midi.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2010-05-26 08:41:25 -07:00
midi.h	ALSA: usb-audio: add support for Akai MPD16	2010-05-21 17:12:30 +02:00
mixer.c	ALSA: usb-audio: fix feature unit parser for UAC2	2010-05-28 07:48:17 +02:00
mixer.h	ALSA: usb-mixer: Add support for Audio Class v2.0	2010-03-12 12:21:26 +01:00
mixer_maps.c	ALSA: usbmixer: rename usbmixer.[ch] -> mixer.[ch]	2010-03-12 12:20:49 +01:00
mixer_quirks.c	ALSA: usb - use of kmalloc/kfree requires the include of slab.h	2010-03-29 08:23:27 +02:00
mixer_quirks.h	ALSA: usb-mixer: factor out quirks	2010-03-12 12:20:26 +01:00
pcm.c	ALSA: usb-audio: add support for UAC2 pitch control	2010-05-27 09:49:37 +02:00
pcm.h	ALSA: usb-audio: add support for samplerate setting on v2 devices	2010-03-05 08:19:17 +01:00
proc.c	ALSA: usb-audio: use a format bitmask per alternate setting	2010-03-05 08:18:32 +01:00
proc.h	ALSA: usb-audio: refactor code	2010-03-05 08:17:14 +01:00
quirks-table.h	ALSA: usb-audio: add support for Akai MPD16	2010-05-21 17:12:30 +02:00
quirks.c	ALSA: usb-audio: add support for Akai MPD16	2010-05-21 17:12:30 +02:00
quirks.h	ALSA: usb-audio: refactor code	2010-03-05 08:17:14 +01:00
urb.c	sound: fixup for usb_buffer_alloc/free rename	2010-05-20 21:15:18 -07:00
urb.h	ALSA: usb-audio: refactor code	2010-03-05 08:17:14 +01:00
usbaudio.h	ALSA: usb-audio: add support for Akai MPD16	2010-05-21 17:12:30 +02:00