]> 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>
Fri, 24 Jun 2016 06:29:45 +0000 (08:29 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 24 Jun 2016 06:29:45 +0000 (08:29 +0200)
commitaf94828d62b63a9b999b2d87a6805093eab6ecf2
treeeabb532439ac57e05d07d36f7432208e0782fde4
parent1be3afce58877c14f7963dc727e8d5a0889ffbff
parentfd860522c51c030b45773d2f1de0bbf8ef2e6a9a
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Backmerge drm-next for the reworked device register/unregistering.
Chris Wilson needs that to be able to land his i915 load/unload
demidlayering.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_lvds.c