p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
linux_old1/drivers/media/video/cx231xx
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
..
Kconfig V4L/DVB (11494a): cx231xx Kconfig fixes 2009-04-29 15:41:11 -03:00
Makefile V4L/DVB (11038): Fix the issue with audio module & correction of Names 2009-04-06 21:44:06 -03:00
cx231xx-audio.c V4L/DVB: cx231xx: card->driver "Conexant cx231xx Audio" too long 2010-05-18 00:51:17 -03:00
cx231xx-avcore.c tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
cx231xx-cards.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
cx231xx-conf-reg.h V4L/DVB (12470): cx231xx/cx231xx-conf-reg.h: fix bad whitespaces 2009-09-12 12:19:01 -03:00
cx231xx-core.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2010-05-20 21:26:12 -07:00
cx231xx-dvb.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
cx231xx-i2c.c V4L/DVB (12343): Stop defining I2C adapter IDs nobody uses 2009-09-12 12:18:13 -03:00
cx231xx-input.c V4L/DVB: ir-core: remove ir-functions usage from cx231xx 2010-05-19 12:58:26 -03:00
cx231xx-pcb-cfg.c V4L/DVB (11133): cx231xx: don't print pcb config debug messages by default 2009-04-06 21:44:09 -03:00
cx231xx-pcb-cfg.h V4L/DVB (11129): cx231xx: Use generic names for each device block 2009-04-06 21:44:07 -03:00
cx231xx-reg.h V4L/DVB (10958): cx231xx: some additional CodingStyle and minor fixes 2009-04-06 21:44:04 -03:00
cx231xx-vbi.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
cx231xx-vbi.h V4L/DVB (10957): cx231xx: Fix CodingStyle 2009-04-06 21:44:03 -03:00
cx231xx-video.c V4L/DVB: cx231xx: switch to new vbi subdev ops 2010-05-19 12:58:51 -03:00
cx231xx.h V4L/DVB: ir-core: remove ir-functions usage from cx231xx 2010-05-19 12:58:26 -03:00