Linus Torvalds b05005772f Merge branch 'origin' ...

Conflicts:
	Documentation/video4linux/CARDLIST.cx88
	drivers/media/video/cx88/Kconfig
	drivers/media/video/em28xx/em28xx-video.c
	drivers/media/video/saa7134/saa7134-dvb.c

Resolved as in the original merge by Mauro Carvalho Chehab

2006-03-21 08:52:18 -08:00

..

a800.c

[PATCH] USB: remove .owner field from struct usb_driver

2006-01-04 13:48:34 -08:00

cxusb.c

V4L/DVB (3352): Cxusb: fix lgdt3303 naming

2006-03-03 14:18:01 -03:00

cxusb.h

V4L/DVB (3312): DViCO USB IR Remote support

2006-01-09 18:21:29 -02:00

dibusb-common.c

V4L/DVB (3318b): sem2mutex: drivers/media/, #2

2006-02-07 06:49:14 -02:00

dibusb-mb.c

V4L/DVB (3323): Add Kconfig option for wrongly programmed devices

2006-01-09 18:21:36 -02:00

dibusb-mc.c

[PATCH] USB: remove .owner field from struct usb_driver

2006-01-04 13:48:34 -08:00

dibusb.h

[PATCH] dvb: Add support for the Artec T1 USB2.0 box

2005-11-09 07:56:05 -08:00

digitv.c

V4L/DVB (3313): FIX: Check if FW was downloaded or not + new firmware file

2006-02-07 06:53:22 -02:00

digitv.h

[PATCH] dvb: Add generalized dvb-usb driver

2005-06-24 00:05:30 -07:00

dtt200u-fe.c

V4L/DVB (3344a): Conversions from kmalloc+memset to k(z|c)alloc

2006-01-11 19:40:56 -02:00

dtt200u.c

[PATCH] dvb NULL noise removal

2006-02-07 20:57:52 -05:00

dtt200u.h

V4L/DVB (3321): Indention cleanups

2006-01-09 18:21:34 -02:00

dvb-usb-common.h

DVB (2420): Makes integration of future devices easier

2006-01-09 15:25:04 -02:00

dvb-usb-dvb.c

[PATCH] fix for race problem in DVB USB drivers (dibusb)

2005-08-27 11:03:45 -07:00

dvb-usb-firmware.c

V4L/DVB (3428): drivers/media/dvb/ possible cleanups

2006-01-23 17:11:09 -02:00

dvb-usb-i2c.c

V4L/DVB (3320): Check if PLL-description is set

2006-01-09 18:21:33 -02:00

dvb-usb-ids.h

V4L/DVB (3350): Added USB ID for DigitalNow DVB-T Dual USB, DViCO clone

2006-01-12 00:11:19 -02:00

dvb-usb-init.c

V4L/DVB (3413): Typos grab bag of the month

2006-03-08 12:30:19 -03:00

dvb-usb-remote.c

[PATCH] drivers/media: convert to dynamic input_dev allocation

2005-10-28 09:52:53 -07:00

dvb-usb-urb.c

V4L/DVB (3318b): sem2mutex: drivers/media/, #2

2006-02-07 06:49:14 -02:00

dvb-usb.h

V4L/DVB (3413): Typos grab bag of the month

2006-03-08 12:30:19 -03:00

Kconfig

V4L/DVB (3299): Kconfig: DVB_USB_CXUSB depends on DVB_LGDT330X and DVB_MT352

2006-02-07 06:45:33 -02:00

Makefile

[PATCH] dvb: usb: add TwinhanDTV StarBox support

2005-09-09 13:57:40 -07:00

nova-t-usb2.c

V4L/DVB (3322): Whitespace cleanup and unused code removed

2006-01-09 18:21:35 -02:00

umt-010.c

[PATCH] USB: remove .owner field from struct usb_driver

2006-01-04 13:48:34 -08:00

vp702x-fe.c

V4L/DVB (3344a): Conversions from kmalloc+memset to k(z|c)alloc

2006-01-11 19:40:56 -02:00

vp702x.c

V4L/DVB (3318b): sem2mutex: drivers/media/, #2

2006-02-07 06:49:14 -02:00

vp702x.h

V4L/DVB (3428): drivers/media/dvb/ possible cleanups

2006-01-23 17:11:09 -02:00

vp7045-fe.c

V4L/DVB (3312): FIX: Multiple usage of VP7045-based devices

2006-02-07 06:53:05 -02:00

vp7045.c

Merge branch 'origin'

2006-03-21 08:52:18 -08:00

vp7045.h

[PATCH] dvb: Add generalized dvb-usb driver

2005-06-24 00:05:30 -07:00