]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitcf4a3c696ad824c3a9f25a361c4a959606275561
treef2fa6fe843d9d0d458f5455b3852960439572913
parent82630b2d98dfbf7678910d939993ca950c01a9bc
parentdfdc1b283283992752ebf3e609aa7bbf57c0e2e9
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Tvrtko needs

commit 48d7ec588c792c981ba4e803dfe6556f8f79a521
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