linux/drivers/media/video/em28xx
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
..
em28xx-audio.c V4L/DVB: em28xx: "Empia Em28xx Audio" too long 2010-05-18 00:51:18 -03:00
em28xx-cards.c V4L/DVB: ir-core: Make use of the new IR keymap modules 2010-05-19 12:56:50 -03:00
em28xx-core.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2010-05-20 21:26:12 -07:00
em28xx-dvb.c V4L/DVB: em28xx: fix locks during dvb init sequence 2010-05-19 12:58:28 -03:00
em28xx-i2c.c V4L/DVB (12343): Stop defining I2C adapter IDs nobody uses 2009-09-12 12:18:13 -03:00
em28xx-input.c V4L/DVB: em28xx: fix a regression caused by the rc-map changes 2010-05-19 12:57:00 -03:00
em28xx-reg.h V4L/DVB (13915): em28xx: fix a typo on RC6 modes 2010-02-26 15:10:30 -03:00
em28xx-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
em28xx-video.c V4L/DVB: em28xx: g_tuner must set type field 2010-05-19 12:58:55 -03:00
em28xx.h V4L/DVB: ir-core: Make use of the new IR keymap modules 2010-05-19 12:56:50 -03:00
Kconfig V4L/DVB (12951): em28xx: add Reddo DVB-C USB TV Box 2009-09-19 00:15:32 -03:00
Makefile V4L/DVB (12742): em28xx: add raw VBI support for NTSC 2009-09-18 23:47:41 -03:00