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)
commit74c0167f8bcf02af8ff9f2677b2d85070ba7236d
tree5a840e9abb2e49abd64180c48e6e77ce428b237c
parent5db47e37b38755c5e26e6b8fbc1a32ce73495940
parent559f17bec508548850654dd04525fd69d90f6d4e
Merge drm-next into drm-intel-next-queued

Pull 4.15 into drm-intel-next-queued for next feature pull.

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