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

1  2 
drivers/media/dvb/dvb-usb/anysee.c

Simple merge