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)
commit06249e69324209b41ba017f476764eba347b1127
tree3268b99700246c2e5ed3f832a70057dda8c110b5
parentc7753e905b510ed07efa2a2ade5a2cec0c394d66
parentc33246d793b5bb9d8be7c67918136c310185c23d
Merge branch 'drm-etnaviv-fixes' of git://git.pengutronix.de/git/lst/linux into drm-next

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()