linux-sg2042/drivers/media/v4l2-core
Linus Torvalds 4f1cd91497 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull second set of media updates from Mauro Carvalho Chehab:
 "Despite its size, most of the stuff here is trivial.  This series
  contains:

   - s5p-mfc: additions at the driver and at the core to support H.264
     hardware codec;
   - Some improvements at s5p and davinci embedded drivers;
   - Some V4L2 compliance fixes applied on a few drivers;
   - Several random trivial patches, including several fixes and a few
     new board support additions;

  Notes:

   1) Some Exynos media patches were dependent on some -arm fixes that
      got merged on changeset 782cd9e.  That's why this pull request is
      based that changeset.

   2) As promised, I reviewed the pending VB2 DMABUF series.

      While setting a test environment, it was noticed that the upstream
      support for Samsung Exynos 4 boards (smdk310 and Origen) are
      broken upstream, likely due to regressions: both defconfigs are
      wrong and regulator settings for both boards are broken.  That,
      allied with some bug at the dummy regulator driver, causes OOPSes
      during boot time.

      Long story short: even fixing the above, the proposed patches
      OOPSed when running the DMABUF test.  Not sure yet if the OOPSes
      are due to some other undetected regressions, or due to some bug
      on the patches.

      Due to the above, DMABUF patches for vb2 got NACKed for 3.7."

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (109 commits)
  [media] m5mols: Add missing #include <linux/sizes.h>
  [media] stk1160: Add support for S-Video input
  Revert "[media] omap3isp: Replace cpu_is_omap3630() with ISP revision check"
  [media]  dvb: LNA implementation changes
  [media] v4l2-ioctl: fix W=1 warnings
  [media] v4l2-ioctl: add blocks check for VIDIOC_SUBDEV_G/S_EDID
  [media] omap3isp: Fix compilation error in ispreg.h
  [media] rc-msi-digivox-ii: Add full scan keycodes
  [media] cx25821: testing the wrong variable
  [media] tda18271-common: hold the I2C adapter during write transfers
  [media] ds3000: add module parameter to force firmware upload
  [media] drivers/media: Remove unnecessary semicolon
  [media] winbond: remove space from driver name
  [media] iguanair: cannot send data from the stack
  [media] omap3isp: Replace cpu_is_omap3630() with ISP revision check
  [media] dvb-usb: print small buffers via %*ph
  [media] uvc: Add return code check at vb2_queue_init()
  [media] em28xx: Replace memcpy with struct assignment
  [media] bt8xx: Add video4linux control V4L2_CID_COLOR_KILLER
  [media] mem2mem_testdev: Use devm_kzalloc() in probe
  ...

Conflicts:
	arch/arm/mach-davinci/include/mach/da8xx.h
2012-10-12 12:39:17 +09:00
..
Kconfig [media] Cleanup media Kconfig files 2012-08-21 07:55:47 -03:00
Makefile [media] Cleanup media Kconfig files 2012-08-21 07:55:47 -03:00
tuner-core.c
v4l2-common.c [media] v4l2: spi modalias is an array 2012-09-27 04:42:37 -03:00
v4l2-compat-ioctl32.c [media] v4l2-core: deprecate V4L2_BUF_TYPE_PRIVATE 2012-09-26 09:38:15 -03:00
v4l2-ctrls.c [media] v4l: Add control definitions for new H264 encoder features 2012-10-05 22:42:17 -03:00
v4l2-dev.c [media] v4l2-dev: reorder checks into blocks of ioctls with similar properties 2012-09-26 14:52:07 -03:00
v4l2-device.c [media] v4l2-ctrls: add a filter function to v4l2_ctrl_add_handler 2012-10-01 17:07:07 -03:00
v4l2-event.c [media] v4l2: make vidioc_(un)subscribe_event const 2012-09-26 10:48:52 -03:00
v4l2-fh.c
v4l2-int-device.c
v4l2-ioctl.c [media] v4l2-ioctl: fix W=1 warnings 2012-10-07 10:19:50 -03:00
v4l2-mem2mem.c [media] media v4l2-mem2mem: Use list_first_entry 2012-09-18 12:14:05 -03:00
v4l2-subdev.c [media] v4l2-subdev: add support for the new edid ioctls 2012-09-13 16:07:24 -03:00
videobuf-core.c
videobuf-dma-contig.c
videobuf-dma-sg.c mm: kill vma flag VM_RESERVED and mm->reserved_vm counter 2012-10-09 16:22:19 +09:00
videobuf-dvb.c
videobuf-vmalloc.c mm: kill vma flag VM_RESERVED and mm->reserved_vm counter 2012-10-09 16:22:19 +09:00
videobuf2-core.c [media] videobuf2-core: fill in length field for multiplanar buffers 2012-10-05 22:23:24 -03:00
videobuf2-dma-contig.c
videobuf2-dma-sg.c
videobuf2-memops.c mm: kill vma flag VM_RESERVED and mm->reserved_vm counter 2012-10-09 16:22:19 +09:00
videobuf2-vmalloc.c