projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a1bf09e 2d635fd)
Merge remote-tracking branch 'airlied/drm-next' into topic/drm-misc
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 19 Jul 2016 07:27:29 +0000 (09:27 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 19 Jul 2016 07:27:29 +0000 (09:27 +0200)
commit2383050f6a3a2e00636eabfcf66445af653ddd80
tree45e5eb04a8ac280ce36f0d1e4305c8d816ee2e70tree | snapshot
parenta1bf09e69f8e938fef85f18c117ac390a48f7763commit | diff
parent2d635fded22b71381b01e194a59544f2e8d71ef0commit | 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>
drivers/gpu/drm/bochs/bochs_mm.c diff1 | diff2 | blob | history
drivers/gpu/drm/drm_atomic.c diff1 | diff2 | blob | history
drivers/gpu/drm/ttm/ttm_bo.c diff1 | diff2 | blob | history
drivers/gpu/drm/vc4/vc4_drv.c diff1 | diff2 | blob | history
drivers/gpu/drm/vc4/vc4_kms.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.