diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-02-16 09:20:45 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-02-16 09:20:45 -0200 |
| commit | 8c755c29108f00c354e3dfa24a2a546be566f604 (patch) | |
| tree | 43416b4bc6f85d655ab63e84a1d8a751e2b4de09 /tools/perf/scripts/python | |
| parent | [media] media.h: get rid of MEDIA_ENT_F_CONN_TEST (diff) | |
| parent | [media] media.h: get rid of MEDIA_ENT_F_CONN_TEST (diff) | |
| download | linux-8c755c29108f00c354e3dfa24a2a546be566f604.tar.gz linux-8c755c29108f00c354e3dfa24a2a546be566f604.zip | |
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()
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions