diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-05-03 21:41:35 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-05-03 21:41:35 +0200 |
| commit | ad15f74ac6c7ed1c7c252a760b017da042ec83fb (patch) | |
| tree | 0b8643ae709d8f413f9b58b544d65aeaf48a0c7a /tools/perf/scripts/python/stackcollapse.py | |
| parent | ALSA: x86: Register multiple PCM devices for the LPE audio card (diff) | |
| parent | Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into drm-next (diff) | |
| download | linux-ad15f74ac6c7ed1c7c252a760b017da042ec83fb.tar.gz linux-ad15f74ac6c7ed1c7c252a760b017da042ec83fb.zip | |
Merge tag 'tags/drm-for-v4.12' into drm-intel-next-queued
Backmerge the main drm-next pull to sync up.
Chris also pointed out that
commit ade0b0c965f59176daddbef9c4717354034f9bce
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat Apr 22 09:15:37 2017 +0100
drm/i915: Confirm the request is still active before adding it to the await
is double-applied in the git merge, so make sure we get this right.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'tools/perf/scripts/python/stackcollapse.py')
0 files changed, 0 insertions, 0 deletions