| commit | fb9775aab2a79d09906f841ab8316379c20e5322 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Tue Oct 24 16:58:39 2017 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Tue Oct 24 16:58:39 2017 +1000 |
| tree | 95c7edada5588c1ac3f5eece5047ee33c24dd738 | |
| parent | fef1aa48f488fedbbecd28995f1fd9a2ea2a7ef2 [diff] | |
| parent | 330b52bd9bba1d66028772dfe08c053a34c5069a [diff] |
Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next 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"