Merge tag 'v3.18-rc4' into drm-next
authorDave Airlie <airlied@redhat.com>
Wed, 12 Nov 2014 00:29:34 +0000 (10:29 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 12 Nov 2014 07:53:30 +0000 (17:53 +1000)
commit51b44eb17b8ec6c83eac7772b4c8bc5887c5fbf7
tree4125e1888cbc215ec4a365457505a407f48e5232
parentcc7096fb6d1dfbdac5e7e2675c046fd40646cc66
parent206c5f60a3d902bc4b56dab2de3e88de5eb06108
Merge tag 'v3.18-rc4' into drm-next

backmerge to get vmwgfx locking changes into next as the
conflict with per-plane locking.
drivers/gpu/drm/armada/armada_crtc.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c