From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Apr 2013 15:17:07 +0000 (-0700)
Subject: Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d7d7271f421f1e45289f2a737c7f636c02c673ce;p=openwrt%2Fstaging%2Fblogic.git

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
---

d7d7271f421f1e45289f2a737c7f636c02c673ce