diff options
| author |   Dave Airlie <airlied@redhat.com> | 2020-07-24 08:28:09 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-07-24 08:48:05 +1000 |
| commit | 41206a073ceebc517245677a19f52ba6379b33a9 (patch) | |
| tree | 2fc35aac6abe32b99058ad55b0fc6e4d449d1056 /tools/perf/scripts/python/export-to-sqlite.py | |
| parent | Merge tag 'amd-drm-next-5.9-2020-07-17' of git://people.freedesktop.org/~agd5f/linux into drm-next (diff) | |
| parent | Linux 5.8-rc6 (diff) | |
| download | linux-rng-41206a073ceebc517245677a19f52ba6379b33a9.tar.xz linux-rng-41206a073ceebc517245677a19f52ba6379b33a9.zip | |
Merge v5.8-rc6 into drm-next
I've got a silent conflict + two trees based on fixes to merge.
Fixes a silent merge with amdgpu
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'tools/perf/scripts/python/export-to-sqlite.py')
0 files changed, 0 insertions, 0 deletions