linux/sound/usb
Greg Kroah-Hartman ff4b8a57f0 Merge branch 'driver-core-next' into Linux 3.2
This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
and it fixes the build error in the arch/x86/kernel/microcode_core.c
file, that the merge did not catch.

The microcode_core.c patch was provided by Stephen Rothwell
<sfr@canb.auug.org.au> who was invaluable in the merge issues involved
with the large sysdev removal process in the driver-core tree.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2012-01-06 11:42:52 -08:00
..
6fire USB: convert sound/* to use module_usb_driver() 2011-11-18 09:50:44 -08:00
caiaq USB: convert sound/* to use module_usb_driver() 2011-11-18 09:50:44 -08:00
misc USB: convert sound/* to use module_usb_driver() 2011-11-18 09:50:44 -08:00
usx2y USB: convert sound/* to use module_usb_driver() 2011-11-18 09:50:44 -08:00
card.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
card.h
clock.c
clock.h
debug.h
endpoint.c
endpoint.h
format.c
format.h
helper.c
helper.h
Kconfig ALSA: snd-usb-caiaq: Add support for Maschine 2011-10-13 08:16:46 +02:00
Makefile
midi.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
midi.h
mixer_maps.c
mixer_quirks.c
mixer_quirks.h
mixer.c ALSA: snd_usb_audio: add Logitech HD Webcam c510 to quirk-384 2011-11-09 12:22:38 +01:00
mixer.h
pcm.c
pcm.h
power.h
proc.c
proc.h
quirks-table.h ALSA: usb-audio - Support for Roland GAIA SH-01 Synthesizer 2011-11-29 08:23:15 +01:00
quirks.c ALSA: usb-audio: Use kmemdup rather than duplicating its implementation 2011-11-10 19:51:45 +01:00
quirks.h
stream.c
stream.h
usbaudio.h