From: Dave Airlie <airlied@redhat.com>
Date: Wed, 13 Jan 2016 21:58:06 +0000 (+1000)
Subject: Merge branch 'drm-etnaviv-fixes' of git://git.pengutronix.de/git/lst/linux into drm-next
X-Git-Tag: v4.5-rc1~74^2~4
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=06249e69324209b41ba017f476764eba347b1127;p=linux.git

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

06249e69324209b41ba017f476764eba347b1127