| commit | 2383050f6a3a2e00636eabfcf66445af653ddd80 | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Tue Jul 19 09:27:29 2016 +0200 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Tue Jul 19 09:27:29 2016 +0200 |
| tree | 45e5eb04a8ac280ce36f0d1e4305c8d816ee2e70 | |
| parent | a1bf09e69f8e938fef85f18c117ac390a48f7763 [diff] | |
| parent | 2d635fded22b71381b01e194a59544f2e8d71ef0 [diff] |
Merge remote-tracking branch 'airlied/drm-next' into topic/drm-misc Backmerge drm-next to be able to apply Chris' connector_unregister_all cleanup (need latest i915 and sun4i state for that). Also there's a trivial conflict in ttm_bo.c that git rerere fails to remember. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>