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
..
blackfin
davinci	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-10-07 17:49:05 +09:00
exynos-gsc	[media] drivers/media: Remove unnecessary semicolon	2012-10-07 09:15:18 -03:00
marvell-ccic
omap	fbdev updates for 3.7	2012-10-12 10:21:02 +09:00
omap3isp	Merge branch 'staging/for_v3.7' into v4l_for_linus	2012-10-11 15:07:19 -03:00
s5p-fimc	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-10-07 17:49:05 +09:00
s5p-g2d
s5p-jpeg
s5p-mfc	[media] s5p-mfc: Set vfl_dir for encoder	2012-10-05 23:09:04 -03:00
s5p-tv
soc_camera	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-10-07 17:49:05 +09:00
arv.c
coda.c
coda.h
fsl-viu.c
indycam.c
indycam.h
Kconfig	[media] s5p-mfc: Update MFC v4l2 driver to support MFC6.x	2012-10-05 23:08:31 -03:00
m2m-deinterlace.c
Makefile
mem2mem_testdev.c	[media] mem2mem_testdev: Use devm_kzalloc() in probe	2012-10-06 11:51:54 -03:00
mx2_emmaprp.c
omap24xxcam-dma.c
omap24xxcam.c	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-10-07 17:49:05 +09:00
omap24xxcam.h
sh_vou.c
timblogiw.c
via-camera.c
via-camera.h
vino.c	mm: kill vma flag VM_RESERVED and mm->reserved_vm counter	2012-10-09 16:22:19 +09:00
vino.h
vivi.c