From: Dave Airlie <airlied@redhat.com>
Date: Fri, 6 Sep 2019 06:57:34 +0000 (+1000)
Subject: Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9a60b2990d6c2b7ab935fe0a5cc274de67d98bed;p=linux.git

Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next

single etnaviv fix for an error path.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Lucas Stach <l.stach@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/4ae00cfb47c8e6fffca5dbb45ae9370cd4e5eaf4.camel@pengutronix.de
---

9a60b2990d6c2b7ab935fe0a5cc274de67d98bed