git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a2757b6
9fe6206
)
Merge remote branch 'origin/master' into drm-intel-next
author
Eric Anholt
<eric@anholt.net>
Mon, 2 Aug 2010 02:23:53 +0000
(19:23 -0700)
committer
Eric Anholt
<eric@anholt.net>
Mon, 2 Aug 2010 02:34:47 +0000
(19:34 -0700)
This resolves the conflict in the EDP code, which has been rather
popular to hack on recently.
Conflicts:
drivers/gpu/drm/i915/intel_dp.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff