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
..
au0828	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
bt8xx	V4L/DVB: v4l2-common: simplify prio utility functions	2010-05-19 12:58:54 -03:00
cpia2	V4L/DVB: v4l2-common: simplify prio utility functions	2010-05-19 12:58:54 -03:00
cx18	V4L/DVB: v4l2-common: simplify prio utility functions	2010-05-19 12:58:54 -03:00
cx88	V4L/DVB: cx88: fix setting input when using DVB	2010-05-19 12:58:27 -03:00
cx231xx	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
cx23885	V4L/DVB: Read MAC for TeVii S470 PCI-e DVB-S2 card	2010-05-19 12:58:28 -03:00
cx25840	V4L/DVB: cx18/cx25840/saa7115/tvp5150: remove vbi support from s_fmt	2010-05-19 12:58:52 -03:00
davinci	V4L/DVB: v4l2-common: simplify prio utility functions	2010-05-19 12:58:54 -03:00
em28xx	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
et61x251	V4L/DVB: video/et61x251: improve error handling	2010-05-19 12:57:26 -03:00
gspca	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
hdpvr	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
ivtv	V4L/DVB: ivtv: fix VIDIOC_S_PRIORITY handling	2010-05-19 12:58:58 -03:00
omap	V4L/DVB: omap_vout:V4L2 Display: Changed enum return type to int	2010-05-19 12:58:11 -03:00
ovcamchip
pvrusb2	V4L/DVB: v4l2-common: simplify prio utility functions	2010-05-19 12:58:54 -03:00
pwc	V4L/DVB: pwc Kconfig dependency fix	2010-05-19 12:57:20 -03:00
saa7134	V4L/DVB: v4l2-common: simplify prio utility functions	2010-05-19 12:58:54 -03:00
saa7164
sn9c102	V4L/DVB: video/sn9c102: improve error handling	2010-05-19 12:57:27 -03:00
tlg2300	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
usbvideo
usbvision	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
uvc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
zc0301	V4L/DVB: video/zc0301: improve error handling	2010-05-19 12:57:26 -03:00
zoran
adv7170.c
adv7175.c
adv7180.c
adv7343_regs.h
adv7343.c
ak881x.c	V4L/DVB: V4L: v4l2-subdev driver for AK8813 and AK8814 TV-encoders from AKM	2010-05-19 12:58:02 -03:00
arv.c
bt819.c
bt856.c
bt866.c
btcx-risc.c
btcx-risc.h
bw-qcam.c
bw-qcam.h
c-qcam.c
cafe_ccic-regs.h
cafe_ccic.c
cpia_pp.c
cpia_usb.c
cpia.c
cpia.h
cs53l32a.c
cs5345.c
cs8420.h
cx2341x.c
dabusb.c
dabusb.h
hexium_gemini.c
hexium_orion.c
ibmmpeg2.h
indycam.c
indycam.h
ir-kbd-i2c.c	V4L/DVB: ir-core: Make use of the new IR keymap modules	2010-05-19 12:56:50 -03:00
Kconfig	V4L/DVB: [-next] media: fix vivi build error	2010-05-19 12:58:42 -03:00
ks0127.c
ks0127.h
m52790.c
Makefile	V4L/DVB: V4L2: Add support for OMAP2/3 V4L2 display driver on top of DSS2	2010-05-19 12:58:10 -03:00
mem2mem_testdev.c	V4L/DVB: vivi and mem2mem_testdev need slab.h to build	2010-05-19 12:59:18 -03:00
meye.c
meye.h
msp3400-driver.c
msp3400-driver.h
msp3400-kthreads.c
mt9m001.c
mt9m111.c
mt9t031.c
mt9t112.c
mt9v011.c
mt9v011.h
mt9v022.c
mx1_camera.c	V4L/DVB: V4L2: Replace loops for finding max buffers in VIDIOC_REQBUFS callbacks	2010-05-19 12:57:13 -03:00
mx3_camera.c
mxb.c
mxb.h
omap24xxcam-dma.c
omap24xxcam.c	V4L/DVB: V4L2: Replace loops for finding max buffers in VIDIOC_REQBUFS callbacks	2010-05-19 12:57:13 -03:00
omap24xxcam.h
ov511.c	V4L/DVB: ov511: cleanup: remove unneeded null check	2010-05-19 12:59:13 -03:00
ov511.h
ov772x.c
ov7670.c
ov9640.c
ov9640.h
pms.c
pxa_camera.c	V4L/DVB: V4L2: Replace loops for finding max buffers in VIDIOC_REQBUFS callbacks	2010-05-19 12:57:13 -03:00
rj54n1cb0c.c
s2255drv.c	V4L/DVB: s2255drv: remove dead code	2010-05-19 12:59:14 -03:00
saa711x_regs.h
saa717x.c
saa5246a.c
saa5249.c
saa6588.c
saa7110.c
saa7115.c	V4L/DVB: cx18/cx25840/saa7115/tvp5150: remove vbi support from s_fmt	2010-05-19 12:58:52 -03:00
saa7121.h
saa7127.c	V4L/DVB: saa7127: support new vbi ops to set/get VBI format	2010-05-19 12:58:48 -03:00
saa7146.h
saa7146reg.h
saa7185.c
saa7191.c
saa7191.h
se401.c
se401.h
sh_mobile_ceu_camera.c	V4L/DVB: sh_mobile_ceu_camera.c: preserve output window on VIDIOC_S_CROP	2010-05-19 12:57:59 -03:00
sh_vou.c	V4L/DVB: V4L: SuperH Video Output Unit (VOU) driver	2010-05-19 12:58:01 -03:00
soc_camera_platform.c
soc_camera.c	V4L/DVB: soc-camera: update comment	2010-05-19 12:58:00 -03:00
soc_mediabus.c
stk-sensor.c
stk-webcam.c
stk-webcam.h
stradis.c
stv680.c
stv680.h
tcm825x.c
tcm825x.h
tda7432.c
tda9840.c
tda9875.c
tea6415c.c
tea6415c.h
tea6420.c
tea6420.h
ths7303.c
tlv320aic23b.c
tuner-core.c
tvaudio.c
tveeprom.c
tvp514x_regs.h
tvp514x.c
tvp5150_reg.h
tvp5150.c	V4L/DVB: cx18/cx25840/saa7115/tvp5150: remove vbi support from s_fmt	2010-05-19 12:58:52 -03:00
tvp7002_reg.h
tvp7002.c	V4L/DVB: tvp7002.c: fix some copy-paste errors in the comments	2010-05-19 12:59:02 -03:00
tw9910.c
upd64031a.c
upd64083.c
v4l1-compat.c
v4l2-common.c	V4L/DVB: v4l2-common: simplify prio utility functions	2010-05-19 12:58:54 -03:00
v4l2-compat-ioctl32.c	V4L/DVB: V4L: Events: Add new ioctls for events	2010-05-19 12:58:06 -03:00
v4l2-dev.c	V4L/DVB: v4l2-dev: remove unnecessary lock around atomic clear_bit	2010-05-19 12:58:56 -03:00
v4l2-device.c
v4l2-event.c	V4L/DVB: event: Export the v4l2_event_init and v4l2_event_dequeue functions	2010-05-19 12:58:24 -03:00
v4l2-fh.c	V4L/DVB: V4L: Events: Support event handling in do_ioctl	2010-05-19 12:58:07 -03:00
v4l2-int-device.c
v4l2-ioctl.c	V4L/DVB: V4L: Events: Support event handling in do_ioctl	2010-05-19 12:58:07 -03:00
v4l2-mem2mem.c	V4L/DVB: add memory-to-memory device helper framework for videobuf	2010-05-19 12:58:03 -03:00
videobuf-core.c	V4L/DVB: videobuf: make poll() report proper flags for output video devices	2010-05-19 12:58:40 -03:00
videobuf-dma-contig.c	V4L/DVB: videobuf-dma-contig.c: simplify pointer dereference	2010-05-19 12:58:01 -03:00
videobuf-dma-sg.c	V4L/DVB: buf-dma-sg.c: don't assume nr_pages == sglen	2010-05-19 12:58:40 -03:00
videobuf-dvb.c	V4L/DVB: v4l videobuf: rename videobuf_queue_to_vmalloc to videobuf_queue_to_vaddr	2010-05-19 12:57:52 -03:00
videobuf-vmalloc.c	V4L/DVB: videobuf-vmalloc: remove __videobuf_sync()	2010-05-19 12:58:39 -03:00
vino.c
vino.h
vivi.c	V4L/DVB: vivi and mem2mem_testdev need slab.h to build	2010-05-19 12:59:18 -03:00
vp27smpx.c
vpx3220.c
w9966.c	V4L/DVB: w9966: convert to V4L2	2010-05-19 12:57:09 -03:00
w9968cf_decoder.h
w9968cf_vpp.h
w9968cf.c
w9968cf.h
wm8739.c
wm8775.c
zr364xx.c	V4L/DVB: V4L2: Replace loops for finding max buffers in VIDIOC_REQBUFS callbacks	2010-05-19 12:57:13 -03:00