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
Kconfig	ALSA: snd-usb-caiaq: Add support for Maschine	2011-10-13 08:16:46 +02:00
Makefile	ALSA: snd-usb: move code from urb.c to endpoint.c	2011-09-14 17:07:03 +02:00
card.c	sound: Add module.h to the previously silent sound users	2011-10-31 19:31:21 -04:00
card.h	ALSA: usb: refine delay information with USB frame counter	2011-09-12 10:30:20 +02:00
clock.c	ALSA: usb-audio: increase control transfer timeout	2011-09-27 09:21:48 +02:00
clock.h	ALSA: usb-audio: simplify control interface access	2010-06-23 16:10:23 +02:00
debug.h	ALSA: usb-audio: make hwc_debug a noop in case HW_CONST_DEBUG is not set	2011-05-18 11:44:35 +02:00
endpoint.c	ALSA: snd-usb: move code from urb.c to endpoint.c	2011-09-14 17:07:03 +02:00
endpoint.h	ALSA: snd-usb: move code from urb.c to endpoint.c	2011-09-14 17:07:03 +02:00
format.c	ALSA: usb-audio: increase control transfer timeout	2011-09-27 09:21:48 +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-audio: increase control transfer timeout	2011-09-27 09:21:48 +02:00
helper.h	ALSA: usb-audio: increase control transfer timeout	2011-09-27 09:21:48 +02:00
midi.c	sound: Add module.h to the previously silent sound users	2011-10-31 19:31:21 -04:00
midi.h	ALSA: usb-audio: add support for Akai MPD16	2010-05-21 17:12:30 +02:00
mixer.c	ALSA: snd_usb_audio: add Logitech HD Webcam c510 to quirk-384	2011-11-09 12:22:38 +01:00
mixer.h	ALSA: snd-usb: operate on given mixer interface only	2011-08-04 16:24:10 +02:00
mixer_maps.c	ALSA: usb-audio: unify constants from specification	2010-05-31 18:17:22 +02:00
mixer_quirks.c	ALSA: usb-audio: increase control transfer timeout	2011-09-27 09:21:48 +02:00
mixer_quirks.h	ALSA: usb-mixer: factor out quirks	2010-03-12 12:20:26 +01:00
pcm.c	ALSA: usb-audio: increase control transfer timeout	2011-09-27 09:21:48 +02:00
pcm.h	ALSA: usb: refine delay information with USB frame counter	2011-09-12 10:30:20 +02:00
power.h	ALSA: usbaudio: implement USB autosuspend	2011-03-11 14:59:29 +01:00
proc.c	ALSA: usb-audio: automatically detect feedback format	2010-10-27 09:17:41 +02:00
proc.h	ALSA: usb-audio: refactor code	2010-03-05 08:17:14 +01:00
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	ALSA: usb-audio: refactor code	2010-03-05 08:17:14 +01:00
stream.c	ALSA: snd-usb: move code from urb.c to endpoint.c	2011-09-14 17:07:03 +02:00
stream.h	ALSA: snd-usb: re-order code	2011-09-14 17:07:02 +02:00
usbaudio.h	ALSA: usb-audio: add Starr Labs USB MIDI support	2011-08-26 14:12:34 +02:00