From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed, 9 Apr 2014 12:33:47 +0000 (+0200)
Subject: Merge remote-tracking branch 'airlied/drm-next' into HEAD
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~44^2~63^2~42
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cbf3202098f191f8b0a0606b2df0af047f21fe5;p=pandora-kernel.git

Merge remote-tracking branch 'airlied/drm-next' into HEAD

Backmerge drm-next after the big s/crtc->fb/crtc->primary->fb/
cocinelle patch to avoid endless amounts of conflict hilarity in my
-next queue for 3.16.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

8cbf3202098f191f8b0a0606b2df0af047f21fe5
Reading git-diff-tree failed