projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5ac9056 1cf915d)
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)
commit94558e265b9539b2ecec98d037bae51c902663c1
treee2782bc903759c2a8bf0af9b3a8ec090a3b1bd3etree | snapshot
parent5ac9056753e79ac5ad1ccc3c99b311688e46e8c9commit | diff
parent1cf915d305b6e1d57db6c35c208016f9747ba3c6commit | diff
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 diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_lrc.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_pm.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.