projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 262ca2b 0b99836)
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)
commitb80d6c781e7eb16e24c2a04a88ab6b230bcbbb35
treeaeb0885a6a3499ef96b2472be323965db8e1295etree | snapshot
parent262ca2b08fbdb9346e66ef30424b2226a00e0ffccommit | diff
parent0b99836f238f37a8632a3ab4f9a8cc2346a36d40commit | 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
John Crispins staging tree