From: Dave Airlie Date: Wed, 12 Nov 2014 00:29:34 +0000 (+1000) Subject: Merge tag 'v3.18-rc4' into drm-next X-Git-Tag: v3.19-rc1~73^2~73 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=51b44eb17b8ec6c83eac7772b4c8bc5887c5fbf7;p=linux.git Merge tag 'v3.18-rc4' into drm-next backmerge to get vmwgfx locking changes into next as the conflict with per-plane locking. --- 51b44eb17b8ec6c83eac7772b4c8bc5887c5fbf7