Merge tag 'v4.0-rc2' into drm-fixes
authorDave Airlie <airlied@redhat.com>
Fri, 6 Mar 2015 21:39:37 +0000 (07:39 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 6 Mar 2015 21:39:37 +0000 (07:39 +1000)
Linux 4.0-rc2

Merging this manually as the i915 change is in it,
and intel fixes are on top of this


Trivial merge