git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 04feced c39b069)
Merge remote-tracking branch 'airlied/drm-next' into HEAD
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 9 Apr 2014 12:33:47 +0000 (14:33 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 9 Apr 2014 12:33:47 +0000 (14:33 +0200)
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>

Trivial merge
Pandora Kernel Repository