Merge tag 'v4.2-rc7' into drm-next
authorDave Airlie <airlied@redhat.com>
Mon, 17 Aug 2015 04:13:53 +0000 (14:13 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 17 Aug 2015 04:13:53 +0000 (14:13 +1000)
Linux 4.2-rc7

Backmerge master for i915 fixes


Trivial merge