diff options
author | 2017-12-04 16:04:45 -0200 | |
---|---|---|
committer | 2017-12-04 16:04:45 -0200 | |
commit | 7b47c66cfa203288c43851260edeeb0fae56f692 (patch) | |
tree | fa729735fdaf1d77fbbf13062fd53c31b59d682d /tools/perf/scripts/python/export-to-sqlite.py | |
parent | drm/prime: skip CPU sync in map/unmap dma_buf (diff) | |
parent | Merge tag 'drm-intel-next-2017-11-17-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (diff) | |
download | wireguard-linux-7b47c66cfa203288c43851260edeeb0fae56f692.tar.xz wireguard-linux-7b47c66cfa203288c43851260edeeb0fae56f692.zip |
Merge arlied/drm-next into drm-misc-next
We need to pull 66660d4cf21b (drm: add connector info/property for
non-desktop displays [v2]) into drm-misc-next to continue the development
of the display rotation series.
Effectively this also pulls 4.15-r2 into drm-misc-next.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Diffstat (limited to 'tools/perf/scripts/python/export-to-sqlite.py')
0 files changed, 0 insertions, 0 deletions