Merge drm-next into drm-intel-next-queued
authorJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Mon, 29 Jan 2018 09:51:57 +0000 (11:51 +0200)
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Mon, 29 Jan 2018 09:51:57 +0000 (11:51 +0200)
Pull 4.15 into drm-intel-next-queued for next feature pull.

Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

Trivial merge