]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6e4beb9 35f037e)
Merge branch 'topic/dp-aux-rework' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 19 Mar 2014 14:54:37 +0000 (15:54 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 19 Mar 2014 14:54:37 +0000 (15:54 +0100)
commitd0a9071ef473cedabc89fbac8516ac0673f76931
treeaeb0885a6a3499ef96b2472be323965db8e1295etree | snapshot
parent6e4beb93b49cab0047cbe1bfcba1d523432bbf77commit | diff
parent35f037e896de5b058e208948d983c5178a1aa507commit | diff
Merge branch 'topic/dp-aux-rework' into drm-intel-next-queued

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

A bit a mess with reverts which differe in details between -fixes and
-next and some other unrelated shuffling.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_gem.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_dp.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_drv.h diff1 | diff2 | blob | history
Linux Kernel Source Tree.