diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2023-04-16 18:50:39 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2023-04-16 20:11:53 +0200 |
| commit | 7f6f26d7adee150e09d7537acc6d6894c27c0b7a (patch) | |
| tree | 8706529cde6e982b9382fc6bf83b3ff470493342 /tools/perf/scripts/python/flamegraph.py | |
| parent | video/aperture: Provide a VGA helper for gma500 and internal use (diff) | |
| parent | Merge tag 'drm-intel-next-fixes-2023-04-13' of git://anongit.freedesktop.org/... (diff) | |
| download | linux-7f6f26d7adee150e09d7537acc6d6894c27c0b7a.tar.gz linux-7f6f26d7adee150e09d7537acc6d6894c27c0b7a.zip | |
Merge drm/drm-next into drm-misc-next
Backmerging drm-next to sync with msm tree. Resolves a conflict
between aperture-helper changes and msm's use of those interfaces.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'tools/perf/scripts/python/flamegraph.py')
0 files changed, 0 insertions, 0 deletions