git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0ac225e
32ce697
)
Merge branch 'edp-training-fixes' into drm-intel-next
author
Keith Packard
<keithp@keithp.com>
Thu, 20 Oct 2011 20:40:33 +0000
(13:40 -0700)
committer
Keith Packard
<keithp@keithp.com>
Thu, 20 Oct 2011 21:10:07 +0000
(14:10 -0700)
Conflicts:
drivers/gpu/drm/i915/intel_dp.c
Just whitespace change conflicts
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff