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)
commitb0b20ce347b66a705943628ec0cc9e0a30eb785e
treef818bf6665a714c937fe5d6aa65e88e07ac2051f
parent4afb1534775ffcea984ab63cf9cc217203318bfe
parent13a7a6ac0a11197edcd0f756a035f472b42cdf8b
Merge tag 'v4.0-rc2' into drm-fixes

Linux 4.0-rc2

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