git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Daniel Vetter <daniel.vetter@ffwll.ch>
	Wed, 17 Dec 2014 19:24:02 +0000 (20:24 +0100)
committer	Daniel Vetter <daniel.vetter@ffwll.ch>
	Wed, 17 Dec 2014 19:24:02 +0000 (20:24 +0100)
commit	0cef3716e78823eb6cec36006bd214c6ea56e837
tree	221a922470b6eb5c37a01ee2b2e5ae0c2070bbea	tree \| snapshot
parent	efbf16fc8b7d52106d9b33bf933ac0da01ac42d3	commit \| diff
parent	3544ddeb34d29786bd14b4c601fcbeb75fd5063b	commit \| diff

Merge branch 'topic/core-stuff' into topic/atomic-core

Backmerge my drm-misc branch because of conflicts. Just simple stuff
but better to clear this out before I merge the other atomic patches.

Conflicts:
drivers/gpu/drm/drm_crtc.c
drivers/gpu/drm/drm_edid.c

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Linux Kernel Source Tree.

RSS Atom

drivers/gpu/drm/drm_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_plane_helper.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/sti/sti_drm_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tegra/dc.c	diff1 \|	diff2 \|	blob \| history