git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
262ca2b
0b99836
)
Merge branch 'topic/dp-aux-rework' into drm-intel-next-queued
author
Daniel Vetter
<daniel.vetter@ffwll.ch>
Wed, 19 Mar 2014 14:54:37 +0000
(15:54 +0100)
committer
Daniel Vetter
<daniel.vetter@ffwll.ch>
Wed, 19 Mar 2014 14:54:37 +0000
(15:54 +0100)
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>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff