Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm...
authorDave Airlie <airlied@redhat.com>
Tue, 24 Oct 2017 06:58:39 +0000 (16:58 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 24 Oct 2017 06:58:39 +0000 (16:58 +1000)
Disable perfmon ioctls for now in etnaviv

* 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux:
  drm/etnaviv: short-circuit perfmon ioctls
  Revert "drm/etnaviv: submit supports performance monitor requests"


Trivial merge