Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 17 Nov 2016 13:32:57 +0000 (14:32 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 17 Nov 2016 13:32:57 +0000 (14:32 +0100)
commit3975797f3e72bd115c6ba80210c5fe65ebd9e14e
treef2fa6fe843d9d0d458f5455b3852960439572913
parent78424c927cf194e2eb689b7871780e9182bd8c13
parentb7c0e47d98249c2ddf21ea197b651093c6aaee00
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Tvrtko needs

commit b3c11ac267d461d3d597967164ff7278a919a39f
Author: Eric Engestrom <eric@engestrom.ch>
Date:   Sat Nov 12 01:12:56 2016 +0000

    drm: move allocation out of drm_get_format_name()

to be able to apply his patches without conflicts.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
drivers/gpu/drm/drm_edid.c
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_atomic_plane.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_fbdev.c
drivers/gpu/drm/i915/intel_sprite.c