projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 86a930d 7f0801e)
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)
commit0f9e9cd61f46c07246e30871fd638ffeaca3c576
tree1a7b84871da0f2ebad48c6838f66fbe91cc26995tree | snapshot
parent86a930d5e9702391f6f997366686a48885f21513commit | diff
parent7f0801e566cc78315e5dc383bf3c3b5b5b436048commit | 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
Unnamed repository; edit this file 'description' to name the repository.