projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d480c89) | patch
MLK-21257-3: media: isi: fix some conflicts when do upgrade
authorGuoniu.Zhou <guoniu.zhou@nxp.com>
Wed, 27 Mar 2019 03:10:51 +0000 (11:10 +0800)
committerLeonard Crestez <leonard.crestez@nxp.com>
Wed, 17 Apr 2019 23:51:34 +0000 (02:51 +0300)
commitadfe0db8d601de1bdd880a92a44da5f03507111e
tree5c42a43356119df4b6d258a5e4af629de2a127f1tree | snapshot
parentd480c89d840a05c519ca444297c55483e07736f8commit | diff
MLK-21257-3: media: isi: fix some conflicts when do upgrade

Fix some conflicts when do kernel 4.19 upgrade

Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
drivers/media/platform/imx8/mxc-isi-core.c diff | blob | history
drivers/media/platform/imx8/mxc-isi-core.h diff | blob | history