openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/media/video/gspca
History
Linus Torvalds 7a9b149212 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (229 commits)
  USB: remove unused usb_buffer_alloc and usb_buffer_free macros
  usb: musb: update gfp/slab.h includes
  USB: ftdi_sio: fix legacy SIO-device header
  USB: kl5usb105: reimplement using generic framework
  USB: kl5usb105: minor clean ups
  USB: kl5usb105: fix memory leak
  USB: io_ti: use kfifo to implement write buffering
  USB: io_ti: remove unsused private counter
  USB: ti_usb: use kfifo to implement write buffering
  USB: ir-usb: fix incorrect write-buffer length
  USB: aircable: fix incorrect write-buffer length
  USB: safe_serial: straighten out read processing
  USB: safe_serial: reimplement read using generic framework
  USB: safe_serial: reimplement write using generic framework
  usb-storage: always print quirks
  USB: usb-storage: trivial debug improvements
  USB: oti6858: use port write fifo
  USB: oti6858: use kfifo to implement write buffering
  USB: cypress_m8: use kfifo to implement write buffering
  USB: cypress_m8: remove unused drain define
  ...

Fix up conflicts (due to usb_buffer_alloc/free renaming) in
	drivers/input/tablet/acecad.c
	drivers/input/tablet/kbtab.c
	drivers/input/tablet/wacom_sys.c
	drivers/media/video/gspca/gspca.c
	sound/usb/usbaudio.c
 		2010-05-20 21:26:12 -07:00
..
gl860 V4L/DVB (13898): gspca - some subdrivers: Make sd_desc const. 2010-02-26 15:10:29 -03:00
m5602 include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
stv06xx V4L/DVB: gspca - stv06xx: Remove the 046d:08da from the stv06xx driver 2010-05-06 19:19:04 -03:00
Kconfig V4L/DVB: gspca - sn9c20x: use gspca's input device handling 2010-05-18 00:49:44 -03:00
Makefile V4L/DVB (14003): gspca_cpai1: New gspca subdriver for CPIA CPiA version 1 cams 2010-02-26 15:10:40 -03:00
benq.c USB: rename usb_buffer_alloc() and usb_buffer_free() users 2010-05-20 13:21:38 -07:00
coarse_expo_autogain.h V4L/DVB: gscpa_sonixb: Differentiate between sensors with a coarse and fine expo ctrl 2010-02-26 15:11:08 -03:00
conex.c V4L/DVB (13899): gspca - all subdrivers: Make control descriptors constant. 2010-02-26 15:10:29 -03:00
cpia1.c V4L/DVB: cpia1: comment unused command_setlights() 2010-05-19 12:57:14 -03:00
etoms.c V4L/DVB (13899): gspca - all subdrivers: Make control descriptors constant. 2010-02-26 15:10:29 -03:00
finepix.c V4L/DVB (13453): gspca - all subdrivers: Remove the unused frame ptr from pkt_scan(). 2009-12-05 18:41:59 -02:00
gspca.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2010-05-20 21:26:12 -07:00
gspca.h V4L/DVB: [-next] gspca: fix build for INPUT=m or INPUT=n 2010-05-19 12:57:30 -03:00
jeilinj.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
jpeg.h V4L/DVB (11039): gspca - most jpeg subdrivers: Change the JPEG header creation. 2009-03-30 12:43:22 -03:00
mars.c V4L/DVB (13899): gspca - all subdrivers: Make control descriptors constant. 2010-02-26 15:10:29 -03:00
mr97310a.c V4L/DVB: gspca_mr97310a: add support for the Sakar 1638x CyberPix 2010-02-26 15:11:09 -03:00
ov519.c Merge branch 'for-next' into for-linus 2010-03-08 16:55:37 +01:00
ov534.c V4L/DVB: Fix bad whitespacing 2010-05-18 00:47:01 -03:00
ov534_9.c V4L/DVB: gspca - ov534_9: Propagate USB errors to higher level 2010-02-26 15:10:47 -03:00
pac207.c V4L/DVB: gspca - pac207: Let all pac207 ctrls have a coherent naming 2010-05-18 00:46:28 -03:00
pac7302.c V4L/DVB: gspca_pac7302: much improved exposure control 2010-02-26 15:11:09 -03:00
pac7311.c V4L/DVB: gscpa_pac7311: Add support for camera button 2010-02-26 15:11:08 -03:00
pac_common.h V4L/DVB: gspca_pac7302: much improved exposure control 2010-02-26 15:11:09 -03:00
sn9c20x.c V4L/DVB: gspca - sn9c20x: Fix non working mt9v111 sensor 2010-05-19 12:59:01 -03:00
sn9c2028.c V4L/DVB: gspca - cpia1 / sn9c2028: Make control descriptors constant 2010-05-18 00:46:31 -03:00
sn9c2028.h V4L/DVB (13992): gspca_sn9c2028: New gspca subdriver 2010-02-26 15:10:39 -03:00
sonixb.c V4L/DVB: gspca_sonixb: Make sonixb driver handle pas106 and pas202 cameras 2010-02-26 15:11:09 -03:00
sonixj.c V4L/DVB: gspca - sonixj: Add sensor soi768 2010-05-19 12:58:15 -03:00
spca500.c V4L/DVB (13899): gspca - all subdrivers: Make control descriptors constant. 2010-02-26 15:10:29 -03:00
spca501.c V4L/DVB (13899): gspca - all subdrivers: Make control descriptors constant. 2010-02-26 15:10:29 -03:00
spca505.c V4L/DVB (13899): gspca - all subdrivers: Make control descriptors constant. 2010-02-26 15:10:29 -03:00
spca506.c V4L/DVB (13899): gspca - all subdrivers: Make control descriptors constant. 2010-02-26 15:10:29 -03:00
spca508.c V4L/DVB: gspca: make usb id 0461:0815 get handled by the right driver 2010-05-06 19:19:05 -03:00
spca561.c V4L/DVB: gspca_spca561: Add support for camera button 2010-05-18 00:50:11 -03:00
sq905.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
sq905c.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
stk014.c V4L/DVB (13899): gspca - all subdrivers: Make control descriptors constant. 2010-02-26 15:10:29 -03:00
stv0680.c V4L/DVB (13996): gspca_stv0680: Fix streaming on vga cameras 2010-02-26 15:10:39 -03:00
sunplus.c V4L/DVB (13924): gspca - sunplus: Optimize and remove unused sequences. 2010-02-26 15:10:31 -03:00
t613.c V4L/DVB: gspca - t613: Add color controls 2010-05-18 00:52:48 -03:00
tv8532.c V4L/DVB (13899): gspca - all subdrivers: Make control descriptors constant. 2010-02-26 15:10:29 -03:00
vc032x.c V4L/DVB: gspca - vc032x: Change the ov7670 format to YUYV 2010-05-19 12:57:35 -03:00
w996Xcf.c V4L/DVB (13453): gspca - all subdrivers: Remove the unused frame ptr from pkt_scan(). 2009-12-05 18:41:59 -02:00
zc3xx-reg.h V4L/DVB (9868): gspca - zc3xx: Remove the duplicated register names 2008-12-30 09:38:58 -02:00
zc3xx.c V4L/DVB: gspca - zc3xx: Fix the gamma calculation from the contrast 2010-05-19 12:58:16 -03:00