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	81cd2cdd35d1c717beb3572955ae9bcf4c533098
tree	221a922470b6eb5c37a01ee2b2e5ae0c2070bbea	tree \| snapshot
parent	5af3ab76396d422a2ff391f5e557dbbbc35e884b	commit \| diff
parent	af8717fbc617ef36c2710eb45f1a219f4a44b40c	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