| commit | d98c71dadc2d0debdb80beb5a478baf1e6f98758 | [log] [tgz] |
|---|---|---|
| author | Gustavo Padovan <gustavo.padovan@collabora.com> | Wed Jun 20 13:22:22 2018 -0300 |
| committer | Gustavo Padovan <gustavo.padovan@collabora.com> | Wed Jun 20 13:22:22 2018 -0300 |
| tree | bf873c28d3acced1814f8b2dba4ae69d2ed77333 | |
| parent | d67b6a2065076d763c7df626b8c54f16038ad862 [diff] | |
| parent | daf0678c2036c918f01e4aa6035629d2debc2f30 [diff] |
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>