Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm...
authorDave Airlie <airlied@redhat.com>
Tue, 22 May 2018 00:37:07 +0000 (10:37 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 22 May 2018 00:43:27 +0000 (10:43 +1000)
So what we have for this cycle is a bit of spring cleaning with removal
of unused register logging code and getting rid of the license text in
favor of SPDX, a few smaller MMU handling improvements and a timeout
calculation change, fixing premature fence wait timeouts after 50 days
of uptime.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1526652437.28565.2.camel@pengutronix.de
1  2 
drivers/gpu/drm/etnaviv/etnaviv_drv.c

Simple merge