diff options
author | 2018-06-20 13:22:22 -0300 | |
---|---|---|
committer | 2018-06-20 13:22:22 -0300 | |
commit | d98c71dadc2d0debdb80beb5a478baf1e6f98758 (patch) | |
tree | bf873c28d3acced1814f8b2dba4ae69d2ed77333 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | drm: writeback: Add client capability for exposing writeback connectors (diff) | |
parent | Merge branch 'drm-next-4.18' of git://people.freedesktop.org/~agd5f/linux into drm-next (diff) | |
download | wireguard-linux-d98c71dadc2d0debdb80beb5a478baf1e6f98758.tar.xz wireguard-linux-d98c71dadc2d0debdb80beb5a478baf1e6f98758.zip |
Merge drm-upstream/drm-next into drm-misc-next
We got a few conflicts in drm_atomic.c after merging the DRM writeback support,
now we need a backmerge to unlock develop development on drm-misc-next.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions