git.maquefel.me Git - linux.git/commit

author	Daniel Vetter <daniel.vetter@ffwll.ch>
	Tue, 19 Jul 2016 07:27:29 +0000 (09:27 +0200)
committer	Daniel Vetter <daniel.vetter@ffwll.ch>
	Tue, 19 Jul 2016 07:27:29 +0000 (09:27 +0200)
commit	2383050f6a3a2e00636eabfcf66445af653ddd80
tree	45e5eb04a8ac280ce36f0d1e4305c8d816ee2e70	tree \| snapshot
parent	a1bf09e69f8e938fef85f18c117ac390a48f7763	commit \| diff
parent	2d635fded22b71381b01e194a59544f2e8d71ef0	commit \| 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>

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

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