q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/drivers/media/video
History
Linus Torvalds 76d21c5635 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (442 commits)
  [media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t
  [media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly
  [media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE
  [media] v4l: soc-camera: Store negotiated buffer settings
  [media] rc: interim support for 32-bit NEC-ish scancodes
  [media] mceusb: topseed 0x0011 needs gen3 init for tx to work
  [media] lirc_zilog: error out if buffer read bytes != chunk size
  [media] lirc: silence some compile warnings
  [media] hdpvr: use same polling interval as other OS
  [media] ir-kbd-i2c: pass device code w/key in hauppauge case
  [media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap
  [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map
  [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge
  [media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping
  [media] rc-rc5-hauppauge-new: Add support for the old Black RC
  [media] rc-rc5-hauppauge-new: Add the old control to the table
  [media] rc-winfast: Fix the keycode tables
  [media] a800: Fix a few wrong IR key assignments
  [media] opera1: Use multimedia keys instead of an app-specific mapping
  [media] dw2102: Use multimedia keys instead of an app-specific mapping
  ...

Fix up trivial conflicts (remove/modify and some real conflicts) in:
	arch/arm/mach-omap2/devices.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/dabusb/dabusb.c
	drivers/staging/dabusb/dabusb.h
	drivers/staging/easycap/easycap_ioctl.c
	drivers/staging/usbvideo/usbvideo.c
	drivers/staging/usbvideo/vicam.c
2011-03-24 09:50:13 -07:00
..
au0828 [media] several drivers: Fix a few gcc 4.6 warnings 2011-03-22 04:54:05 -03:00
bt8xx [media] several drivers: Fix a few gcc 4.6 warnings 2011-03-22 04:54:05 -03:00
cpia2 [media] v4l2-ioctl: add priority handling support 2011-03-22 16:37:59 -03:00
cx18 [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map 2011-03-22 19:24:16 -03:00
cx88 [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map 2011-03-22 19:24:16 -03:00
cx231xx [media] drivers:media:cx231xx.h remove one to many l's in the word 2011-03-21 20:32:41 -03:00
cx23885 [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge 2011-03-22 19:24:14 -03:00
cx25840 [media] cx25840: fix probing of cx2583x chips 2011-03-02 13:45:33 -03:00
davinci [media] v4l2-ioctl: add priority handling support 2011-03-22 16:37:59 -03:00
em28xx [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map 2011-03-22 19:24:16 -03:00
et61x251 [media] et61x251: remove wrongly claimed usb ids 2011-01-19 11:45:01 -02:00
gspca [media] gspca - zc3xx: Add exposure control for sensor hv7131r 2011-03-22 16:38:27 -03:00
hdpvr [media] hdpvr: use same polling interval as other OS 2011-03-22 19:24:19 -03:00
ivtv [media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap 2011-03-22 19:24:17 -03:00
omap Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
omap3isp [media] omap3isp: Add set performance callback in isp platform data 2011-03-22 04:53:55 -03:00
pvrusb2 [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map 2011-03-22 19:24:16 -03:00
pwc [media] v4l2-ioctl: add priority handling support 2011-03-22 16:37:59 -03:00
s5p-fimc [media] s5p-fimc: Fix G_FMT ioctl handler 2011-03-22 04:54:20 -03:00
saa7134 [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map 2011-03-22 19:24:16 -03:00
saa7164 [media] video/saa7164: Fix sparse warning: Using plain integer as NULL pointer 2011-03-21 20:32:19 -03:00
sn9c102 [media] video: sn9c102: world-wirtable sysfs files 2011-03-21 20:32:21 -03:00
tlg2300 [media] drivers/media/video/tlg2300/pd-video.c: Remove second mutex_unlock in pd_vidioc_s_fmt 2011-03-22 06:51:57 -03:00
usbvision
uvc [media] uvcvideo: Fix descriptor parsing for video output devices 2011-03-22 06:51:48 -03:00
zoran [media] zoran: use video_device_alloc instead of kmalloc 2011-01-19 11:52:12 -02:00
adv7170.c
adv7175.c [media] adv7175: support s_power 2011-01-19 11:45:55 -02:00
adv7180.c
adv7343.c [media] adv7343: use control framework 2011-03-21 20:31:49 -03:00
adv7343_regs.h [media] adv7343: use control framework 2011-03-21 20:31:49 -03:00
ak881x.c
arv.c
bt819.c [media] bt819: use control framework 2011-03-21 20:31:49 -03:00
bt856.c
bt866.c
btcx-risc.c
btcx-risc.h
bw-qcam.c
c-qcam.c
cafe_ccic-regs.h
cafe_ccic.c [media] v4l2-subdev: remove core.s_config and v4l2_i2c_new_subdev_cfg() 2011-01-19 11:45:30 -02:00
cs53l32a.c
cs5345.c [media] cs5345: use the control framework 2011-03-21 20:31:49 -03:00
cs8420.h
cx2341x.c
fsl-viu.c dt: Eliminate of_platform_{,un}register_driver 2011-02-28 13:22:46 -07:00
hexium_gemini.c [media] v4l: fix handling of v4l2_input.capabilities 2010-12-30 08:02:29 -02:00
hexium_orion.c [media] v4l: fix handling of v4l2_input.capabilities 2010-12-30 08:02:29 -02:00
ibmmpeg2.h
imx074.c
indycam.c
indycam.h
ir-kbd-i2c.c [media] ir-kbd-i2c: pass device code w/key in hauppauge case 2011-03-22 19:24:18 -03:00
Kconfig [media] omap3isp: Kconfig and Makefile 2011-03-22 04:53:54 -03:00
ks0127.c
ks0127.h
m52790.c
Makefile [media] omap3isp: Kconfig and Makefile 2011-03-22 04:53:54 -03:00
mem2mem_testdev.c [media] Update Pawel Osciak's e-mail address 2011-03-22 04:55:05 -03:00
meye.c [media] v4l2-ioctl: add priority handling support 2011-03-22 16:37:59 -03:00
meye.h
msp3400-driver.c
msp3400-driver.h
msp3400-kthreads.c
mt9m001.c [media] v4l: Rename V4L2_MBUS_FMT_GREY8_1X8 to V4L2_MBUS_FMT_Y8_1X8 2011-03-22 04:53:23 -03:00
mt9m111.c
mt9t031.c
mt9t112.c
mt9v011.c [media] v4l2-subdev: remove core.s_config and v4l2_i2c_new_subdev_cfg() 2011-01-19 11:45:30 -02:00
mt9v022.c [media] v4l: Rename V4L2_MBUS_FMT_GREY8_1X8 to V4L2_MBUS_FMT_Y8_1X8 2011-03-22 04:53:23 -03:00
mx1_camera.c [media] v4l: soc-camera: switch to .unlocked_ioctl 2010-12-30 22:29:26 -02:00
mx2_camera.c [media] v4l: soc-camera: switch to .unlocked_ioctl 2010-12-30 22:29:26 -02:00
mx3_camera.c [media] V4L: mx3_camera: convert to videobuf2 2011-03-21 20:32:15 -03:00
mxb.c [media] v4l2-ioctl: add priority handling support 2011-03-22 16:37:59 -03:00
mxb.h
noon010pc30.c [media] Add v4l2 subdev driver for NOON010PC30L image sensor 2011-03-21 20:31:40 -03:00
omap1_camera.c [media] V4L: omap1_camera: join split format lines 2011-03-21 20:32:14 -03:00
omap24xxcam-dma.c
omap24xxcam.c [media] omap24xxcam: Fix compilation 2011-03-21 20:32:19 -03:00
omap24xxcam.h
ov772x.c [media] v4l: ov772x: simplify pointer dereference 2010-12-30 22:29:23 -02:00
ov2640.c [media] V4L2: Add a v4l2-subdev (soc-camera) driver for OmniVision OV2640 sensor 2010-12-30 22:29:34 -02:00
ov6650.c [media] v4l: Rename V4L2_MBUS_FMT_GREY8_1X8 to V4L2_MBUS_FMT_Y8_1X8 2011-03-22 04:53:23 -03:00
ov7670.c [media] v4l2-subdev: remove core.s_config and v4l2_i2c_new_subdev_cfg() 2011-01-19 11:45:30 -02:00
ov7670.h
ov9640.c [media] ov9640: fix OmniVision OV9640 sensor driver's priv data retrieving 2010-12-30 22:29:21 -02:00
ov9640.h
ov9740.c [media] V4L: Initial submit of OV9740 driver 2011-03-21 20:32:16 -03:00
pms.c
pxa_camera.c [media] v4l: soc-camera: switch to .unlocked_ioctl 2010-12-30 22:29:26 -02:00
rj54n1cb0c.c
s2255drv.c [media] s2255drv: firmware re-loading changes 2011-02-02 11:13:37 -02:00
saa711x_regs.h
saa717x.c
saa6588.c
saa7110.c [media] saa7110: use control framework 2011-03-21 20:31:50 -03:00
saa7115.c [media] fix saa7111 non-detection 2011-01-31 14:19:50 -02:00
saa7121.h
saa7127.c
saa7146.h
saa7146reg.h
saa7185.c
saa7191.c
saa7191.h
sh_mobile_ceu_camera.c [media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly 2011-03-22 19:41:57 -03:00
sh_mobile_csi2.c [media] v4l: Rename V4L2_MBUS_FMT_GREY8_1X8 to V4L2_MBUS_FMT_Y8_1X8 2011-03-22 04:53:23 -03:00
sh_vou.c
soc_camera.c [media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE 2011-03-22 19:41:56 -03:00
soc_camera_platform.c
soc_mediabus.c [media] v4l: Rename V4L2_MBUS_FMT_GREY8_1X8 to V4L2_MBUS_FMT_Y8_1X8 2011-03-22 04:53:23 -03:00
sr030pc30.c [media] v4l2-subdev: remove core.s_config and v4l2_i2c_new_subdev_cfg() 2011-01-19 11:45:30 -02:00
stk-sensor.c
stk-webcam.c
stk-webcam.h
tcm825x.c
tcm825x.h
tda7432.c
tda9840.c
tea6415c.c
tea6415c.h
tea6420.c
tea6420.h
ths7303.c
timblogiw.c mfd: mfd_cell is now implicitly available to timberdale drivers 2011-03-23 10:41:52 +01:00
tlv320aic23b.c [media] tlv320aic23b: use control framework 2011-03-21 20:31:50 -03:00
tuner-core.c [media] tuner-core: Don't touch at standby during tuner_lookup 2011-03-21 20:32:03 -03:00
tvaudio.c
tveeprom.c
tvp514x.c [media] tvp514x: use the control framework 2011-03-21 20:31:50 -03:00
tvp514x_regs.h
tvp5150.c [media] tvp5150: device detection should be done only once 2011-03-21 20:32:04 -03:00
tvp5150_reg.h
tvp7002.c [media] tvp7002: use control framework 2011-03-21 20:31:50 -03:00
tvp7002_reg.h
tw9910.c
upd64031a.c
upd64083.c
v4l2-common.c [media] v4l2_prio: move from v4l2-common to v4l2-dev 2011-03-22 16:37:54 -03:00
v4l2-compat-ioctl32.c [media] v4l: removal of old, obsolete ioctls 2011-03-21 20:32:12 -03:00
v4l2-ctrls.c [media] v4l2-ctrls: Fix control enumeration for multiple subdevs with ctrl 2011-03-21 20:32:04 -03:00
v4l2-dev.c [media] v4l2: use new flag to enable core priority handling 2011-03-22 16:38:16 -03:00
v4l2-device.c [media] v4l2-device: add kref and a release function 2011-03-22 16:38:05 -03:00
v4l2-event.c
v4l2-fh.c [media] v4l2: use new flag to enable core priority handling 2011-03-22 16:38:16 -03:00
v4l2-int-device.c
v4l2-ioctl.c [media] v4l2: use new flag to enable core priority handling 2011-03-22 16:38:16 -03:00
v4l2-mem2mem.c [media] Update Pawel Osciak's e-mail address 2011-03-22 04:55:05 -03:00
v4l2-subdev.c [media] v4l: subdev: Generic ioctl support 2011-03-22 04:53:45 -03:00
via-camera.c [media] via-camera: Fix OLPC serial check 2011-03-22 16:37:49 -03:00
via-camera.h
videobuf-core.c
videobuf-dma-contig.c [media] V4L: videobuf, don't use dma addr as physical 2011-03-22 06:51:54 -03:00
videobuf-dma-sg.c
videobuf-dvb.c
videobuf-vmalloc.c
videobuf2-core.c [media] vb2: Handle return value from start_streaming callback 2011-03-22 04:55:08 -03:00
videobuf2-dma-contig.c [media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t 2011-03-22 19:41:58 -03:00
videobuf2-dma-sg.c [media] v4l2: vb2-dma-sg: fix potential security hole 2011-03-22 04:54:30 -03:00
videobuf2-memops.c [media] Update Pawel Osciak's e-mail address 2011-03-22 04:55:05 -03:00
videobuf2-vmalloc.c [media] Update Pawel Osciak's e-mail address 2011-03-22 04:55:05 -03:00
vino.c [media] v4l: fix handling of v4l2_input.capabilities 2010-12-30 08:02:29 -02:00
vino.h
vivi.c [media] v4l2: use new flag to enable core priority handling 2011-03-22 16:38:16 -03:00
vp27smpx.c
vpx3220.c [media] vpx3220: use control framework 2011-03-21 20:31:50 -03:00
w9966.c [media] w9966: zero device state after a detach 2011-01-19 11:52:11 -02:00
wm8739.c
wm8775.c [media] Add proper audio support for Nova-S Plus with wm8775 ADC 2011-03-21 20:32:19 -03:00
zr364xx.c