diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2018-12-18 14:24:52 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2018-12-18 14:24:52 +0100 |
| commit | 221b35fedee1b38b9cee99320f0c60263d229e14 (patch) | |
| tree | 1b811389cb8534e9f9ca94ee3db2de700d7992c7 /include | |
| parent | 272c1a9b493986a95219dce674c49877d98cf90f (diff) | |
| parent | 801c7a1e528623f073c4007cb04d9a817e33b3a4 (diff) | |
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 <daniel.vetter@intel.com>
From: Lucas Stach <l.stach@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/1545130845.5874.23.camel@pengutronix.de
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions