From: Dave Airlie <airlied@redhat.com>
Date: Fri, 6 Mar 2015 21:39:37 +0000 (+1000)
Subject: Merge tag 'v4.0-rc2' into drm-fixes
X-Git-Tag: firefly_0821_release~176^2~2198^2~1
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=b0b20ce347b66a705943628ec0cc9e0a30eb785e;p=firefly-linux-kernel-4.4.55.git

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
---

b0b20ce347b66a705943628ec0cc9e0a30eb785e