tree 623e1a8587ece69dbd3a6d2da4ed005bd3f78d1f
parent 96edcf31b3b9d9f53adb110fd4c4d49b458497a9
parent c95789ecd5a979fd718ae09763df3fa50dd97a91
author Linus Torvalds <torvalds@linux-foundation.org> 1366989427 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1366989427 -0700

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/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