| commit | 534b1f9071d95325044c21d47d9f63a45cdf425e | [log] [tgz] |
|---|---|---|
| author | Thomas Zimmermann <tzimmermann@suse.de> | Wed Aug 12 19:17:18 2020 +0200 |
| committer | Thomas Zimmermann <tzimmermann@suse.de> | Wed Aug 12 20:42:08 2020 +0200 |
| tree | 5c2aa3cd65bfb6b9e73d9ad22c021d800380f0f6 | |
| parent | 82dd18096c718962379e61cd8a7a0dc219db174f [diff] | |
| parent | 62975d27d647a40c58d3b96c29b911fc4f33c310 [diff] |
Merge drm/drm-next into drm-misc-next Backmerging drm-next into drm-misc-next for nouveau and panel updates. Resolves a conflict between ttm and nouveau, where struct ttm_mem_res got renamed to struct ttm_resource. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>