git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
eddecbb
b295d6e
)
Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux
author
Paul Mundt
<lethal@linux-sh.org>
Tue, 22 Mar 2011 05:27:36 +0000
(14:27 +0900)
committer
Paul Mundt
<lethal@linux-sh.org>
Tue, 22 Mar 2011 05:27:36 +0000
(14:27 +0900)
Conflicts:
arch/arm/mach-omap2/board-overo.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Trivial merge