]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2ca8c03 f23274b)
Merge tag 'drm-intel-fixes-2015-03-19' into drm-intel-next
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 20 Mar 2015 10:43:59 +0000 (11:43 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 20 Mar 2015 10:44:34 +0000 (11:44 +0100)
commit0d362a46cdfb79b18bd29967c6723112c786d9c0
tree1a7b84871da0f2ebad48c6838f66fbe91cc26995tree | snapshot
parent2ca8c03cea09da5a9602d1e852f0ef6120d46ab9commit | diff
parentf23274b521e04df7ed617f81084631c5aea4d956commit | diff
Merge tag 'drm-intel-fixes-2015-03-19' into drm-intel-next

Backmerge because of numerous and interleaving conflicts and git
rerere getting confused a bit too often.

Conflicts:
drivers/gpu/drm/i915/intel_display.c

All conflicts are because of -next patches backported to -fixes, so
just go with the code in -next.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
drivers/gpu/drm/drm_crtc.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_gem.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_display.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.