From: Daniel Vetter Date: Tue, 18 Dec 2018 13:24:52 +0000 (+0100) Subject: Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm... X-Git-Tag: v5.0-rc1~104^2 X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/221b35fedee1b38b9cee99320f0c60263d229e14?hp=--cc Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next Lucas writes: "nothing major this time, mostly some cleanups that were found on the way of reworking the code in preparation for new feature additions." Small conflict in drivers/gpu/drm/etnaviv/etnaviv_drv.c because drm-misc-next also has a patch to switch over to _put() functions. Signed-off-by: Daniel Vetter From: Lucas Stach Link: https://patchwork.freedesktop.org/patch/msgid/1545130845.5874.23.camel@pengutronix.de --- 221b35fedee1b38b9cee99320f0c60263d229e14