From: Linus Torvalds Date: Tue, 5 May 2015 15:42:06 +0000 (-0700) Subject: Merge tag 'media/v4.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... X-Git-Tag: Ubuntu-5.2.0-15.16~11396 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c02d7da3dd00cb32b58d9c87240456e19eebcc42;p=mirror_ubuntu-eoan-kernel.git Merge tag 'media/v4.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media Pull media fixes from Mauro Carvalho Chehab: "Three driver fixes: - fix for omap4, fixing a regression due to a subsystem API that got removed for 4.1 (commit efde234674d9); - fix for one of the formats supported by Marvel ccic driver; - fix rcar_vin driver that, when stopping abnormally, the driver can't return from wait_for_completion" * tag 'media/v4.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: [media] v4l: omap4iss: Replace outdated OMAP4 control pad API with syscon [media] media: soc_camera: rcar_vin: Fix wait_for_completion [media] marvell-ccic: fix Y'CbCr ordering --- c02d7da3dd00cb32b58d9c87240456e19eebcc42