+88
−855
File changed.
Preview size limit exceeded, changes collapsed.
+54
−0
Loading
Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
Pull in Dave's drm-next pull request to have a clean base for 4.6.
Also, we need the various atomic state extensions Maarten recently
created.
Conflicts are just adjacent changes that all resolve to nothing in git
diff.
Signed-off-by:
Daniel Vetter <daniel.vetter@intel.com>
File changed.
Preview size limit exceeded, changes collapsed.