kevin/linux
1
Fork 0
Code
3e74683137
linux/drivers/media/video
History
Linus Torvalds 3e74683137 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (345 commits)
  V4L/DVB (13542): ir-keytable: Allow dynamic table change
  V4L/DVB (13541): atbm8830: replace 64-bit division and floating point usage
  V4L/DVB (13540): ir-common: Cleanup get key evdev code
  V4L/DVB (13539): ir-common: add __func__ for debug messages
  V4L/DVB (13538): ir-common: Use a dynamic keycode table
  V4L/DVB (13537): ir: Prepare the code for dynamic keycode table allocation
  V4L/DVB (13536): em28xx: Use the full RC5 code on HVR-950 Remote Controller
  V4L/DVB (13535): ir-common: Add a hauppauge new table with the complete RC5 code
  V4L/DVB (13534): ir-common: Remove some unused fields/structs
  V4L/DVB (13533): ir: use dynamic tables, instead of static ones
  V4L/DVB (13532): ir-common: Add infrastructure to use a dynamic keycode table
  V4L/DVB (13531): ir-common: rename the debug routine to allow exporting it
  V4L/DVB (13458): go7007: subdev conversion
  V4L/DVB (13457): s2250: subdev conversion
  V4L/DVB (13456): s2250: Change module structure
  V4L/DVB (13528): em28xx: add support for em2800 VC211A card
  em28xx: don't reduce scale to half size for em2800
  em28xx: don't load audio modules when AC97 is mis-detected
  em28xx: em2800 chips support max width of 640
  V4L/DVB (13523): dvb-bt8xx: fix compile warning
  ...

Fix up trivial conflicts due to spelling fixes from the trivial tree in
	Documentation/video4linux/gspca.txt
	drivers/media/video/cx18/cx18-mailbox.h
2009-12-09 19:50:49 -08:00
..
au0828 V4L/DVB (13238): v4l2_subdev: rename tuner s_standby operation to core s_power 2009-12-05 18:41:03 -02:00
bt8xx V4L/DVB (13537): ir: Prepare the code for dynamic keycode table allocation 2009-12-05 18:42:21 -02:00
cpia2
cx18 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2009-12-09 19:50:49 -08:00
cx88 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2009-12-09 19:50:49 -08:00
cx231xx Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2009-12-09 19:50:49 -08:00
cx23885 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2009-12-09 19:50:49 -08:00
cx25840 V4L/DVB (13232): cx25840 6.5MHz carrier detection fixes 2009-12-05 18:41:01 -02:00
davinci Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2009-12-09 19:50:49 -08:00
em28xx V4L/DVB (13537): ir: Prepare the code for dynamic keycode table allocation 2009-12-05 18:42:21 -02:00
et61x251 const: mark struct vm_struct_operations 2009-09-27 11:39:25 -07:00
gspca Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2009-12-09 19:50:49 -08:00
hdpvr V4L/DVB (13413): introduce missing kfree 2009-12-05 18:41:45 -02:00
ivtv V4L/DVB (13446): ivtv: Add more explicit detection of known IR devices for Hauppauge cards 2009-12-05 18:41:57 -02:00
ovcamchip
pvrusb2 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2009-12-09 19:50:49 -08:00
pwc V4L/DVB (13231): pwc: Use kernel's simple_strtol() 2009-12-05 18:41:01 -02:00
saa7134 Merge branch 'for-next' into for-linus 2009-12-07 18:36:35 +01:00
saa7164 Merge branch 'for-next' into for-linus 2009-12-07 18:36:35 +01:00
sn9c102 const: mark struct vm_struct_operations 2009-09-27 11:39:25 -07:00
usbvideo V4L/DVB (13379): quickcam_messenger: possible buffer overflow while use strncat 2009-12-05 18:41:36 -02:00
usbvision V4L/DVB (13241): Cleanup redundant tests on unsigned 2009-12-05 18:41:04 -02:00
uvc V4L/DVB (13506): uvcvideo: Factorize common field in uvc_entity structure 2009-12-05 18:42:13 -02:00
zc0301 const: mark struct vm_struct_operations 2009-09-27 11:39:25 -07:00
zoran Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2009-12-09 19:50:49 -08:00
adv7170.c
adv7175.c
adv7180.c V4L/DVB (13176): adv7180: Support checking standard via interrupts 2009-12-05 18:40:43 -02:00
adv7343_regs.h
adv7343.c V4L/DVB (12201): adv7343: remove unused #include <linux/version.h> 2009-09-19 00:18:07 -03:00
arv.c
bt819.c V4L/DVB (13241): Cleanup redundant tests on unsigned 2009-12-05 18:41:04 -02:00
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 const: mark struct vm_struct_operations 2009-09-27 11:39:25 -07:00
cpia_pp.c
cpia_usb.c
cpia.c headers: remove sched.h from poll.h 2009-10-04 15:05:10 -07:00
cpia.h
cs53l32a.c
cs5345.c
cs8420.h
cx2341x.c
dabusb.c Driver-Core: fix devnode callbacks for dabusb and industrialio 2009-09-21 07:36:33 -07:00
dabusb.h
font.h
hexium_gemini.c V4L/DVB (13241): Cleanup redundant tests on unsigned 2009-12-05 18:41:04 -02:00
hexium_orion.c V4L/DVB (13241): Cleanup redundant tests on unsigned 2009-12-05 18:41:04 -02:00
ibmmpeg2.h
indycam.c
indycam.h
ir-kbd-i2c.c V4L/DVB (13537): ir: Prepare the code for dynamic keycode table allocation 2009-12-05 18:42:21 -02:00
Kconfig V4L/DVB (13509): pms: convert from V4L1 to V4L2. 2009-12-05 18:42:14 -02:00
ks0127.c
ks0127.h
m52790.c
Makefile V4L/DVB (13130): soc-camera: add a new driver for the RJ54N1CB0C camera sensor from Sharp 2009-12-05 18:40:28 -02:00
meye.c headers: remove sched.h from interrupt.h 2009-10-11 11:20:58 -07:00
meye.h
msp3400-driver.c
msp3400-driver.h
msp3400-kthreads.c
mt9m001.c V4L/DVB (12536): soc-camera: remove .gain and .exposure struct soc_camera_device members 2009-09-19 00:19:20 -03:00
mt9m111.c V4L/DVB (12536): soc-camera: remove .gain and .exposure struct soc_camera_device members 2009-09-19 00:19:20 -03:00
mt9t031.c V4L/DVB (12536): soc-camera: remove .gain and .exposure struct soc_camera_device members 2009-09-19 00:19:20 -03:00
mt9v011.c
mt9v011.h
mt9v022.c V4L/DVB (12536): soc-camera: remove .gain and .exposure struct soc_camera_device members 2009-09-19 00:19:20 -03:00
mx1_camera.c V4L/DVB (13343): v4l: add more missing linux/sched.h includes 2009-11-26 19:38:02 -02:00
mx3_camera.c V4L/DVB (13343): v4l: add more missing linux/sched.h includes 2009-11-26 19:38:02 -02:00
mxb.c V4L/DVB (13241): Cleanup redundant tests on unsigned 2009-12-05 18:41:04 -02:00
mxb.h
omap24xxcam-dma.c
omap24xxcam.c
omap24xxcam.h
ov511.c
ov511.h
ov772x.c tree-wide: fix typos "selct" + "slect" -> "select" 2009-11-09 09:40:56 +01:00
ov7670.c
ov9640.c V4L/DVB (13040): V4L2: Add a v4l2-subdev (soc-camera) driver for OmniVision OV9640 sensor 2009-12-05 18:40:01 -02: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 (13509): pms: convert from V4L1 to V4L2. 2009-12-05 18:42:14 -02:00
pxa_camera.c V4L/DVB (13286): pxa-camera: Fix missing sched.h 2009-11-07 12:55:13 -02:00
rj54n1cb0c.c V4L/DVB (13130): soc-camera: add a new driver for the RJ54N1CB0C camera sensor from Sharp 2009-12-05 18:40:28 -02:00
s2255drv.c Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2009-12-09 19:50:49 -08:00
saa711x_regs.h
saa717x.c V4L/DVB (13396): correct initialization of audio_mode 2009-12-05 18:41:40 -02:00
saa5246a.c
saa5249.c
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
saa7121.h
saa7127.c
saa7146.h
saa7146reg.h
saa7185.c
saa7191.c
saa7191.h
se401.c
se401.h
sh_mobile_ceu_camera.c V4L/DVB (13128): sh_mobile_ceu_camera: add VBP error support 2009-12-05 18:40:28 -02:00
soc_camera_platform.c V4L/DVB (12580): soc-camera: remove now unneeded subdevice group ID assignments 2009-09-19 00:19:22 -03:00
soc_camera.c V4L/DVB (13344): soc-camera: properly initialise the device object when reusing 2009-11-26 19:38:02 -02:00
stk-sensor.c
stk-webcam.c const: mark struct vm_struct_operations 2009-09-27 11:39:25 -07:00
stk-webcam.h
stradis.c
stv680.c V4L/DVB (12369): stv680: kfree called before usb_kill_urb 2009-09-12 12:18:28 -03:00
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 V4L/DVB (13247): tuner-core: dont force every tuner to set frequency at startup 2009-12-05 18:41:06 -02:00
tvaudio.c V4L/DVB (13166): remove duplicate structure field initialization 2009-12-05 18:40:40 -02:00
tveeprom.c V4L/DVB (12478): ARRAY_SIZE changes 2009-09-12 12:19:05 -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 (13292): tvp514x: recognize the error case in tvp514x_read_reg() 2009-12-05 18:41:13 -02:00
tvp5150_reg.h
tvp5150.c
tw9910.c V4L/DVB (12536): soc-camera: remove .gain and .exposure struct soc_camera_device members 2009-09-19 00:19:20 -03:00
upd64031a.c
upd64083.c
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 (13467): V4L2: Added CID's V4L2_CID_ROTATE/BG_COLOR 2009-12-05 18:42:02 -02:00
v4l2-compat-ioctl32.c V4L/DVB (12549): v4l2: video device: Add FM TX controls default configurations 2009-09-12 12:19:19 -03:00
v4l2-dev.c V4L/DVB (12725): v4l: warn when desired devnodenr is in use & add _no_warn function 2009-09-19 00:19:34 -03:00
v4l2-device.c
v4l2-int-device.c
v4l2-ioctl.c V4L/DVB (12543): v4l: introduce string control support. 2009-09-12 12:19:17 -03:00
videobuf-core.c V4L/DVB (13415): videobuf-core: explicitly cast page count 2009-12-05 18:41:46 -02:00
videobuf-dma-contig.c V4L/DVB (13377): make struct videobuf_queue_ops constant 2009-12-05 18:41:35 -02:00
videobuf-dma-sg.c V4L/DVB (13377): make struct videobuf_queue_ops constant 2009-12-05 18:41:35 -02:00
videobuf-dvb.c V4L/DVB (13103): create a standard method for dvb adapter drivers to override frontend ioctls 2009-12-05 18:40:21 -02:00
videobuf-vmalloc.c V4L/DVB (13417): Fix videobuf_queue_vmalloc_init() prototype 2009-12-05 18:41:47 -02:00
vino.c const: mark struct vm_struct_operations 2009-09-27 11:39:25 -07:00
vino.h
vivi.c
vp27smpx.c
vpx3220.c V4L/DVB (13241): Cleanup redundant tests on unsigned 2009-12-05 18:41:04 -02:00
w9966.c
w9968cf_decoder.h
w9968cf_vpp.h
w9968cf.c V4L/DVB (12540): v4l: simplify v4l2_i2c_new_subdev and friends 2009-09-19 00:19:24 -03:00
w9968cf.h
wm8739.c
wm8775.c
zr364xx.c V4L/DVB (13438): zr364xx: add support for Trust Powerc@m 910Z 2009-12-05 18:41:54 -02:00