Merge branch 'topic/core-stuff' into topic/atomic-core
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 17 Dec 2014 19:24:02 +0000 (20:24 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 17 Dec 2014 19:24:02 +0000 (20:24 +0100)
commit72a3697097b8dc92f5b8362598f5730a9986eb83
tree221a922470b6eb5c37a01ee2b2e5ae0c2070bbea
parent22b8b13b6f436ffbb6e540f5f8039b1084a72794
parentdafffda023b04f87e695dfcf5448e4da964d2e95
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>
drivers/gpu/drm/drm_crtc.c
drivers/gpu/drm/drm_plane_helper.c
drivers/gpu/drm/sti/sti_drm_crtc.c
drivers/gpu/drm/tegra/dc.c