Merge tag 'media/v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Jul 2016 10:51:49 +0000 (19:51 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Jul 2016 10:51:49 +0000 (19:51 +0900)
commitcf875cc1dc6cb43cec754e92092579a51d2ad095
tree825eddfbbc59b304f2000ede3d4b187ceb083f5e
parentf1b5e4fac164ff43b189d996e4f05f95cc57b984
parent6519c3d7b8621c9f4333c98ed4b703029b51ba79
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