From: Dave Airlie <airlied@redhat.com>
Date: Wed, 3 Jun 2015 23:23:51 +0000 (+1000)
Subject: Merge tag 'v4.1-rc6' into drm-next
X-Git-Tag: firefly_0821_release~176^2~1470^2~39
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a8a50fce60e86f82e442bf84b8af20750b3d6105;p=firefly-linux-kernel-4.4.55.git

Merge tag 'v4.1-rc6' into drm-next

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

a8a50fce60e86f82e442bf84b8af20750b3d6105