From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 13 Jul 2016 10:51:49 +0000 (+0900)
Subject: Merge tag 'media/v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: v4.14-rc1~2906
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cf875cc1dc6cb43cec754e92092579a51d2ad095;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'media/v4.7-2' of git://git./linux/kernel/git/mchehab/linux-media

Pull media fixes from Mauro Carvalho Chehab:
 "Two regression fixes:

  - a regression when handling VIDIOC_CROPCAP at the media core;

  - a regression at adv7604 that was ignoring pad number in subdev ops"

* tag 'media/v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] adv7604: Don't ignore pad number in subdev DV timings pad operations
  [media] v4l2-ioctl: fix stupid mistake in cropcap condition
---

cf875cc1dc6cb43cec754e92092579a51d2ad095