]> 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, 5 Aug 2016 08:36:15 +0000 (10:36 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 5 Aug 2016 08:36:15 +0000 (10:36 +0200)
commitc4ecdd043dece718fba229d15d4a3ba31b76338b
treee2782bc903759c2a8bf0af9b3a8ec090a3b1bd3e
parent074573fceebc9c097f3a56e21e681abc124f5255
parentf2d6952c67e9f9d868080e943da3d5c8decaf848
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Backmerge the 4.8 pull request state from Dave - conflicts were
getting out of hand, and Chris has some patches which outright don't
apply without everything merged together again.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
drivers/gpu/drm/i915/intel_csr.c
drivers/gpu/drm/i915/intel_lrc.c
drivers/gpu/drm/i915/intel_pm.c