| commit | 8c755c29108f00c354e3dfa24a2a546be566f604 | [log] [tgz] |
|---|---|---|
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | Tue Feb 16 09:20:45 2016 -0200 |
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | Tue Feb 16 09:20:45 2016 -0200 |
| tree | 43416b4bc6f85d655ab63e84a1d8a751e2b4de09 | |
| parent | 360104e3b8485f4923ffc202c1c2b36841de673c [diff] | |
| parent | 9727a9545adec59f4bccb83d1a709711f4acf242 [diff] |
Merge branch 'fixes' into patchwork Some macros were changed/removed at the material for v4.5. We need to sync with those changes here, in order to avoid troubles. * v4l_for_linus: [media] media.h: get rid of MEDIA_ENT_F_CONN_TEST [media] [for,v4.5] media.h: increase the spacing between function ranges [media] media: i2c/adp1653: probe: fix erroneous return value [media] media: davinci_vpfe: fix missing unlock on error in vpfe_prepare_pipeline()