Merge branch 'drm-etnaviv-fixes' of git://git.pengutronix.de/git/lst/linux into drm...
authorDave Airlie <airlied@redhat.com>
Wed, 13 Jan 2016 21:58:06 +0000 (07:58 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 13 Jan 2016 21:58:06 +0000 (07:58 +1000)
etnaviv fixes.

* 'drm-etnaviv-fixes' of git://git.pengutronix.de/git/lst/linux:
  drm/etnaviv: fix workaround for GC500
  drm/etnaviv: unlock on error in etnaviv_gem_get_iova()


Trivial merge