]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit08bbe61dabc068bd71d7c1f4c7b8835e740704a9
tree45e5eb04a8ac280ce36f0d1e4305c8d816ee2e70
parent0b041968053711826ab54b00f3984d6943748e74
parentc1de380c36d103b548d70640485a8f5dc2ab12af
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
drivers/gpu/drm/drm_atomic.c
drivers/gpu/drm/ttm/ttm_bo.c
drivers/gpu/drm/vc4/vc4_drv.c
drivers/gpu/drm/vc4/vc4_kms.c