From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon, 23 Jan 2012 20:11:30 +0000 (-0200)
Subject: Merge branch 'v4l_for_linus' into staging/for_v3.4
X-Git-Tag: firefly_0821_release~3680^2~275^2~2799
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=59b30294e14fa6a370fdd2bc2921cca1f977ef16;p=firefly-linux-kernel-4.4.55.git

Merge branch 'v4l_for_linus' into staging/for_v3.4

* v4l_for_linus:
  [media] cxd2820r: sleep on DVB-T/T2 delivery system switch
  [media] anysee: fix CI init
  [media] cxd2820r: remove unused parameter from cxd2820r_attach
  [media] cxd2820r: fix dvb_frontend_ops
---

59b30294e14fa6a370fdd2bc2921cca1f977ef16