diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-23 15:11:30 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-23 15:11:30 -0500 |
| commit | 59b30294e14fa6a370fdd2bc2921cca1f977ef16 (patch) | |
| tree | 7cb70f6233de563bc04da8cf420a02082e8a2ba5 /fs/autofs4/expire.c | |
| parent | a8ea0218625699a5c635655a17b565bab5888ea1 (diff) | |
| parent | 72565224609a23a60d10fcdf42f87a2fa8f7b16d (diff) | |
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
Diffstat (limited to 'fs/autofs4/expire.c')
0 files changed, 0 insertions, 0 deletions