| commit | 06249e69324209b41ba017f476764eba347b1127 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Thu Jan 14 07:58:06 2016 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Thu Jan 14 07:58:06 2016 +1000 |
| tree | 3268b99700246c2e5ed3f832a70057dda8c110b5 | |
| parent | c7753e905b510ed07efa2a2ade5a2cec0c394d66 [diff] | |
| parent | c33246d793b5bb9d8be7c67918136c310185c23d [diff] |
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()