projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 360104e 9727a95)
Merge branch 'fixes' into patchwork
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>
Tue, 16 Feb 2016 11:20:45 +0000 (09:20 -0200)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Tue, 16 Feb 2016 11:20:45 +0000 (09:20 -0200)
commit8c755c29108f00c354e3dfa24a2a546be566f604
tree43416b4bc6f85d655ab63e84a1d8a751e2b4de09tree | snapshot
parent360104e3b8485f4923ffc202c1c2b36841de673ccommit | diff
parent9727a9545adec59f4bccb83d1a709711f4acf242commit | 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()
include/uapi/linux/media.h diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git