Merge Linus master into drm-next
authorDave Airlie <airlied@redhat.com>
Mon, 20 Apr 2015 01:32:26 +0000 (11:32 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 20 Apr 2015 03:05:20 +0000 (13:05 +1000)
commit2c33ce009ca2389dbf0535d0672214d09738e35e
tree6186a6458c3c160385d794a23eaf07c786a9e61b
parentcec32a47010647e8b0603726ebb75b990a4057a4
parent09d51602cf84a1264946711dd4ea0dddbac599a1
Merge Linus master into drm-next

The merge is clean, but the arm build fails afterwards,
due to API changes in the regulator tree.

I've included the patch into the merge to fix the build.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Documentation/DocBook/drm.tmpl
Documentation/devicetree/bindings/vendor-prefixes.txt
MAINTAINERS
drivers/gpu/drm/drm_crtc.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_trace.h
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/msm/dsi/dsi_host.c