aboutsummaryrefslogtreecommitdiff
path: root/usr
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2014-04-09 14:33:47 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-04-09 14:33:47 +0200
commit8cbf3202098f191f8b0a0606b2df0af047f21fe5 (patch)
tree8e49e81e1879de78fcd6ac64041b9a72db06caec /usr
parent04feced98a434c7046108671dc5b6f50f3b63ed7 (diff)
parentc39b06951f1dc2e384650288676c5b7dcc0ec92c (diff)
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>
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions