git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9fb4c7f
0d66cbb
)
Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux
author
Paul Mundt
<lethal@linux-sh.org>
Tue, 24 May 2011 06:35:54 +0000
(15:35 +0900)
committer
Paul Mundt
<lethal@linux-sh.org>
Tue, 24 May 2011 06:35:54 +0000
(15:35 +0900)
Conflicts:
drivers/video/omap2/dss/dsi.c
drivers/video/omap2/dss/dss_features.c
drivers/video/omap2/dss/dss_features.h
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff