git.agner.ch Git - linux-drm-fsl-dcu.git/commit

Merge branch 'for-linus' into for-next

Conflicts:
drivers/gpu/drm/i915/intel_pm.c

Freescale DCU DRM driver

drivers/gpu/drm/drm_probe_helper.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_context.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/hda_intel.c	diff1 \|	diff2 \|	blob \| history