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)
backmerge to get vmwgfx locking changes into next as the
conflict with per-plane locking.


Trivial merge