Merge tag 'v4.1-rc6' into drm-next
authorDave Airlie <airlied@redhat.com>
Wed, 3 Jun 2015 23:23:51 +0000 (09:23 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 3 Jun 2015 23:23:51 +0000 (09:23 +1000)
Linux 4.1-rc6

backmerge 4.1-rc6 as some of the later pull reqs are based on newer bases
and I'd prefer to do the fixup myself.


Trivial merge