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

V4L/DVB (11304): v4l2: remove v4l2_subdev_command calls where they are no longer needed.

2009-03-30 12:43:49 -03:00

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

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

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

V4L/DVB: drivers/media/video: move dereference after NULL test

2010-05-18 00:47:16 -03:00

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

V4L/DVB: zoran: remove V4L1 videodev.h include

2010-05-18 00:52:41 -03:00

adv7170.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

adv7175.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

adv7180.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

adv7343_regs.h

V4L/DVB (11743): Analog Devices ADV7343 video encoder driver

2009-06-16 18:20:59 -03:00

adv7343.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

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

V4L/DVB: arv: convert to V4L2

2010-05-18 00:52:42 -03:00

bt819.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

bt856.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

bt866.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

btcx-risc.c

…

btcx-risc.h

…

bw-qcam.c

V4L/DVB: bw-qcam: coding style cleanup

2010-05-18 00:51:26 -03:00

bw-qcam.h

…

c-qcam.c

V4L/DVB: c-qcam: coding style cleanup

2010-05-18 00:51:26 -03:00

cafe_ccic-regs.h

…

cafe_ccic.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

cpia_pp.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

cpia_usb.c

…

cpia.c

V4L/DVB: drivers/media: Correct NULL test

2010-02-26 15:10:57 -03:00

cpia.h

…

cs53l32a.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

cs5345.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

cs8420.h

…

cx2341x.c

V4L/DVB: cx2341x: Remove temporal filter control restriction

2010-05-18 00:46:44 -03:00

dabusb.c

USB: Push BKL on open down into the drivers

2010-03-02 14:54:23 -08:00

dabusb.h

…

hexium_gemini.c

V4L/DVB: saa7146: fix regression of the av7110/budget-av driver

2010-05-06 19:20:50 -03:00

hexium_orion.c

V4L/DVB: saa7146: fix regression of the av7110/budget-av driver

2010-05-06 19:20:50 -03:00

ibmmpeg2.h

…

indycam.c

V4L/DVB (10866): saa7191, indycam: remove compat code.

2009-03-30 12:43:11 -03:00

indycam.h

V4L/DVB (10861): vino/indycam/saa7191: convert to i2c modules to V4L2.

2009-03-30 12:43:10 -03:00

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

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

ks0127.h

…

m52790.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

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

V4L/DVB: meye: remove last V4L1 remnants from the code and add v4l2_device

2010-05-18 00:52:36 -03:00

meye.h

V4L/DVB: meye: remove last V4L1 remnants from the code and add v4l2_device

2010-05-18 00:52:36 -03:00

msp3400-driver.c

V4L/DVB (11380): v4l2-subdev: change s_routing prototype

2009-04-06 21:44:27 -03:00

msp3400-driver.h

V4L/DVB (11380): v4l2-subdev: change s_routing prototype

2009-04-06 21:44:27 -03:00

msp3400-kthreads.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

mt9m001.c

V4L/DVB (13659): soc-camera: convert to the new mediabus API

2009-12-16 09:27:29 -02:00

mt9m111.c

V4L/DVB (13659): soc-camera: convert to the new mediabus API

2009-12-16 09:27:29 -02:00

mt9t031.c

V4L/DVB: mt9t031: use runtime pm support to restore ADDRESS_MODE registers

2010-05-18 00:46:21 -03:00

mt9t112.c

soc-camera: mt9t112: modify exiting conditions from standby mode

2010-02-19 03:19:01 -02:00

mt9v011.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

mt9v011.h

V4L/DVB (12340): mtv9v011: Add a missing chip version to the driver

2009-08-13 20:39:02 -03:00

mt9v022.c

V4L/DVB: The first two parameters of soc_camera_limit_side() are usually pointers to struct v4l2_rect elements. They are signed, so adjust the prototype accordingly

2010-05-18 00:44:09 -03:00

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

V4L/DVB: The first two parameters of soc_camera_limit_side() are usually pointers to struct v4l2_rect elements. They are signed, so adjust the prototype accordingly

2010-05-18 00:44:09 -03:00

mxb.c

V4L/DVB: saa7146: fix regression of the av7110/budget-av driver

2010-05-06 19:20:50 -03:00

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

V4L/DVB (11966): ov511: Fix unit_video parameter behavior

2009-06-16 19:07:40 -03:00

ov772x.c

soc-camera: ov772x: Modify buswidth control

2010-02-26 15:11:00 -03:00

ov7670.c

V4L/DVB: ov7670: silence some compiler warnings

2010-05-18 00:51:25 -03:00

ov9640.c

V4L/DVB: Fix bad whitespacing

2010-05-18 00:47:01 -03:00

ov9640.h

V4L/DVB (13040): V4L2: Add a v4l2-subdev (soc-camera) driver for OmniVision OV9640 sensor

2009-12-05 18:40:01 -02:00

pms.c

V4L/DVB: pms: remove unnecessary exclusive open/close

2010-05-18 00:51:30 -03:00

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

V4L/DVB: The first two parameters of soc_camera_limit_side() are usually pointers to struct v4l2_rect elements. They are signed, so adjust the prototype accordingly

2010-05-18 00:44:09 -03:00

s2255drv.c

V4L/DVB: s2255drv: remove dead code

2010-05-19 12:59:14 -03:00

saa711x_regs.h

…

saa717x.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

saa5246a.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

saa5249.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

saa6588.c

V4L/DVB (12215): saa6588: conform to the final RDS spec.

2009-09-12 12:17:31 -03:00

saa7110.c

V4L/DVB (13241): Cleanup redundant tests on unsigned

2009-12-05 18:41:04 -02:00

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

V4L/DVB (10907): avoid loading the entire videodev.h header on V4L2 drivers

2009-03-30 12:43:15 -03:00

saa7146reg.h

…

saa7185.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

saa7191.c

V4L/DVB (11380): v4l2-subdev: change s_routing prototype

2009-04-06 21:44:27 -03:00

saa7191.h

V4L/DVB (10861): vino/indycam/saa7191: convert to i2c modules to V4L2.

2009-03-30 12:43:10 -03:00

se401.c

V4L/DVB (13550): v4l: Use the new video_device_node_name function

2009-12-16 00:17:55 -02:00

se401.h

V4L/DVB (11998): se401: Fix coding style

2009-06-16 19:07:54 -03:00

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

V4L/DVB (13659): soc-camera: convert to the new mediabus API

2009-12-16 09:27:29 -02:00

soc_camera.c

V4L/DVB: soc-camera: update comment

2010-05-19 12:58:00 -03:00

soc_mediabus.c

V4L/DVB: v4l: soc_camera: fix bound checking of mbus_fmt[] index

2010-02-26 15:11:11 -03:00

stk-sensor.c

…

stk-webcam.c

V4L/DVB (13556): v4l: Remove unneeded video_device::minor assignments

2009-12-16 00:17:57 -02:00

stk-webcam.h

…

stradis.c

V4L/DVB (13556): v4l: Remove unneeded video_device::minor assignments

2009-12-16 00:17:57 -02:00

stv680.c

V4L/DVB (13556): v4l: Remove unneeded video_device::minor assignments

2009-12-16 00:17:57 -02:00

stv680.h

…

tcm825x.c

V4L/DVB (12111): tcm825x: remove incorrect __exit_p wrapper

2009-06-23 03:14:48 -03:00

tcm825x.h

…

tda7432.c

V4L/DVB (11564): tda7432: Delete old driver history

2009-06-16 18:20:36 -03:00

tda9840.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

tda9875.c

V4L/DVB (11302): tda9875: remove legacy code for old-style i2c API

2009-03-30 12:43:48 -03:00

tea6415c.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

tea6415c.h

…

tea6420.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

tea6420.h

…

ths7303.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

tlv320aic23b.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

tuner-core.c

V4L/DVB (13964): tuner-core, fix memory leak

2010-02-26 15:10:34 -03:00

tvaudio.c

V4L/DVB (13166): remove duplicate structure field initialization

2009-12-05 18:40:40 -02:00

tveeprom.c

V4L/DVB (13958): tveeprom.c: use %pM to show MAC address

2010-02-26 15:10:34 -03:00

tvp514x_regs.h

V4L/DVB (12246): tvp514x: Migration to sub-device framework

2009-09-19 00:18:09 -03:00

tvp514x.c

V4L/DVB: V4L: tvp514x: Add Powerup sequence during s_input to lock the signal properly

2010-05-18 00:52:47 -03:00

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

V4L/DVB: Definitions for TVP7002 in DM365

2010-02-26 15:11:01 -03:00

tvp7002.c

V4L/DVB: tvp7002.c: fix some copy-paste errors in the comments

2010-05-19 12:59:02 -03:00

tw9910.c

tw9910: use TABs for indentation

2010-02-26 15:10:59 -03:00

upd64031a.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

upd64083.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

v4l1-compat.c

V4L/DVB (12948): v4l1-compat: fix VIDIOC_G_STD handling

2009-09-19 00:15:25 -03:00

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

V4L/DVB: Add SPI support to V4L2

2010-05-18 00:50:24 -03:00

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

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

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

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

vpx3220.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

w9966.c

V4L/DVB: w9966: convert to V4L2

2010-05-19 12:57:09 -03:00

w9968cf_decoder.h

…

w9968cf_vpp.h

…

w9968cf.c

V4L/DVB (13556): v4l: Remove unneeded video_device::minor assignments

2009-12-16 00:17:57 -02:00

w9968cf.h

V4L/DVB (11377): v4l: increase version numbers of drivers converted to v4l2_subdev.

2009-04-06 21:44:26 -03:00

wm8739.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

wm8775.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

zr364xx.c

V4L/DVB: V4L2: Replace loops for finding max buffers in VIDIOC_REQBUFS callbacks

2010-05-19 12:57:13 -03:00