From: Dave Airlie <airlied@redhat.com>
Date: Tue, 19 Dec 2017 11:37:24 +0000 (+1000)
Subject: BackMerge tag 'v4.15-rc4' into drm-next
X-Git-Tag: v4.16-rc1~96^2~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6b7dcb536e3535444c39286333f10d06d2f44fb5;p=thirdparty%2Flinux.git

BackMerge tag 'v4.15-rc4' into drm-next

Linux 4.15-rc4

Daniel requested it to fix some messy conflicts.
---

6b7dcb536e3535444c39286333f10d06d2f44fb5