OSDN Git Service

Merge branch 'v4l_for_linus' into staging/for_v3.4
authorMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 23 Jan 2012 20:11:30 +0000 (18:11 -0200)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 23 Jan 2012 20:11:30 +0000 (18:11 -0200)
commit59b30294e14fa6a370fdd2bc2921cca1f977ef16
tree7cb70f6233de563bc04da8cf420a02082e8a2ba5
parenta8ea0218625699a5c635655a17b565bab5888ea1
parent72565224609a23a60d10fcdf42f87a2fa8f7b16d
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
drivers/media/dvb/dvb-usb/anysee.c