BackMerge v4.18-rc7 into drm-next

rmk requested this for armada and I think we've had a few
conflicts build up.

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2018-07-30 10:39:22 +10:00
commit 3fce461827
865 changed files with 8450 additions and 4508 deletions