From: Daniel Vetter Date: Wed, 12 Oct 2016 06:22:25 +0000 (+0200) Subject: Merge tag 'drm-for-v4.9' into drm-intel-next-queued X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c0c8b9ed1b0c14d91ff73624df6d918bb47c8a5e;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge tag 'drm-for-v4.9' into drm-intel-next-queued It's been over two months, git definitely lost it's marbles. Conflicts resolved by picking our version, plus manually checking the diff with the parent in drm-intel-next-queued to make sure git didn't do anything stupid. It did, so I removed 2 occasions where it double-inserted a bit of code. The diff is now just - kernel-doc changes - drm format/name changes - display-info changes so looks all reasonable. Signed-off-by: Daniel Vetter --- c0c8b9ed1b0c14d91ff73624df6d918bb47c8a5e