linux/drivers/media/video/gspca
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
..
gl860 USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
m5602 USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
stv06xx USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
Kconfig [media] gspca - topro: New subdriver for Topro webcams 2011-09-23 23:28:49 -03:00
Makefile [media] gspca - topro: New subdriver for Topro webcams 2011-09-23 23:28:49 -03:00
autogain_functions.h [media] gspca: New file autogain_functions.h 2011-03-22 04:54:43 -03:00
benq.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
conex.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
cpia1.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
etoms.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
finepix.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
gspca.c gspca: Fix falling back to lower isoc alt settings 2011-12-31 11:53:58 -08:00
gspca.h [media] gspca: Use current logging styles 2011-09-04 11:06:05 -03:00
jeilinj.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
jpeg.h [media] gspca: Remove useless instructions 2011-01-19 11:45:37 -02:00
kinect.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
konica.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
mars.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
mr97310a.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
nw80x.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
ov519.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
ov534.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
ov534_9.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
pac207.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
pac7302.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
pac7311.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
pac_common.h V4L/DVB: gspca_pac7302: much improved exposure control 2010-02-26 15:11:09 -03:00
se401.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
se401.h [media] gspca: Add new se401 camera driver 2011-07-27 17:53:41 -03:00
sn9c20x.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
sn9c2028.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
sn9c2028.h V4L/DVB (13992): gspca_sn9c2028: New gspca subdriver 2010-02-26 15:10:39 -03:00
sonixb.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
sonixj.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
spca500.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
spca501.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
spca505.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
spca506.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
spca508.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
spca561.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
spca1528.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
sq905.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
sq905c.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
sq930x.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
stk014.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
stv0680.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
sunplus.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
t613.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
topro.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
tv8532.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
vc032x.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
vicam.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
w996Xcf.c [media] gspca: Use current logging styles 2011-09-04 11:06:05 -03:00
xirlink_cit.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
zc3xx-reg.h [media] gspca - zc3xx: Remove double definition 2011-03-22 04:54:40 -03:00
zc3xx.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00