Merge branch 'drm-etnaviv-fixes' of git://git.pengutronix.de/git/lst/linux into drm...
authorDave Airlie <airlied@redhat.com>
Thu, 18 Aug 2016 22:50:42 +0000 (08:50 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 18 Aug 2016 22:50:42 +0000 (08:50 +1000)
commitaae2d1fc8323cfc2c6b971bd2127e21af91d9af6
tree58f84329a26c1edbf89d327e7799530e8d29624e
parent91d62d9f30206be6f7749a0e6f7fa58c6d70c702
parentd9853490176c88fff71d03ec9a174b77011f5026
Merge branch 'drm-etnaviv-fixes' of git://git.pengutronix.de/git/lst/linux into drm-fixes

Single GPU recovery fix
* 'drm-etnaviv-fixes' of git://git.pengutronix.de/git/lst/linux:
  drm/etnaviv: take GPU lock later in the submit process