diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-19 15:54:37 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-19 15:54:37 +0100 |
| commit | b80d6c781e7eb16e24c2a04a88ab6b230bcbbb35 (patch) | |
| tree | aeb0885a6a3499ef96b2472be323965db8e1295e | |
| parent | 262ca2b08fbdb9346e66ef30424b2226a00e0ffc (diff) | |
| parent | 0b99836f238f37a8632a3ab4f9a8cc2346a36d40 (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>