Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Apr 2013 15:17:07 +0000 (08:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Apr 2013 15:17:07 +0000 (08:17 -0700)
commitd7d7271f421f1e45289f2a737c7f636c02c673ce
tree623e1a8587ece69dbd3a6d2da4ed005bd3f78d1f
parent96edcf31b3b9d9f53adb110fd4c4d49b458497a9
parentc95789ecd5a979fd718ae09763df3fa50dd97a91
Merge branch 'v4l_for_linus' of git://git./linux/kernel/git/mchehab/linux-media

Pull media fixes from Mauro Carvalho Chehab:
 "Two driver fixes.

  One avoids reading any file at a system with a cx25821 board
  (fortunately, this is not a common device).  The other one prevents
  reading after a buffer with ISDB-T devices based on mb86a20s."

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] cx25821: do not expose broken video output streams
  [media] mb86a20s: Fix estimate_rate setting