From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed, 17 Dec 2014 19:24:02 +0000 (+0100)
Subject: Merge branch 'topic/core-stuff' into topic/atomic-core
X-Git-Tag: omap-for-v4.1/prcm-dts-mfd-syscon-fix~75^2~44^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72a3697097b8dc92f5b8362598f5730a9986eb83;p=pandora-kernel.git

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>
---

72a3697097b8dc92f5b8362598f5730a9986eb83
Reading git-diff-tree failed