openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/media/dvb
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
..
b2c2 V4L/DVB (12294): b2c2: Use dvb-pll for Cablestar2 2009-09-12 12:17:52 -03:00
bt8xx V4L/DVB: drivers/media: drop redundant memset 2010-05-18 00:46:51 -03:00
dm1105 V4L/DVB: ir-core: remove ir-functions usage from dm1105 2010-05-19 12:57:45 -03:00
dvb-core Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-05-20 21:04:44 -07:00
dvb-usb Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2010-05-20 21:26:12 -07:00
firewire V4L/DVB: firedtv: correct version number and current/next in CA_PMT 2010-05-18 00:46:27 -03:00
frontends V4L/DVB: dvb/stv6110x: cleanup error handling 2010-05-19 12:59:12 -03:00
mantis V4L/DVB: ir: prepare IR code for a parameter change at register function 2010-05-19 12:56:50 -03:00
ngene V4L/DVB: ngene: Add lgdt3303 and mt2131 deps to Kconfig 2010-05-19 12:59:11 -03:00
pluto2 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
pt1 V4L/DVB: pt1: Support Earthsoft PT2 2010-05-19 12:57:32 -03:00
siano 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
ttpci V4L/DVB: budget: Oops: "BUG: unable to handle kernel NULL pointer dereference" 2010-05-19 12:57:17 -03:00
ttusb-budget V4L/DVB (10149): ttusb-budget: make it depend on PCI 2009-01-02 17:12:21 -02:00
ttusb-dec USB: rename usb_buffer_alloc() and usb_buffer_free() users 2010-05-20 13:21:38 -07:00
Kconfig V4L/DVB: ngene: Driver compiles now 2010-02-26 15:10:53 -03:00
Makefile V4L/DVB: ngene: Driver compiles now 2010-02-26 15:10:53 -03:00