]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'drm-for-v4.9' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 12 Oct 2016 06:22:25 +0000 (08:22 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 12 Oct 2016 06:22:25 +0000 (08:22 +0200)
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 <daniel.vetter@intel.com>
1  2 
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/intel_audio.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_hdmi.c
drivers/gpu/drm/i915/intel_lvds.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge