Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm...
authorDave Airlie <airlied@redhat.com>
Wed, 27 Sep 2017 19:48:53 +0000 (05:48 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 27 Sep 2017 19:48:53 +0000 (05:48 +1000)
Just two small etnaviv fixes, one fixing a list corruption, the other
fixing a NULL ptr deref in an error path.

* 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux:
  etnaviv: fix gem object list corruption
  etnaviv: fix submit error path

1  2 
drivers/gpu/drm/etnaviv/etnaviv_gem.c
drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c

Simple merge