git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c3bbcf5
d5e1322
)
Merge branch 'for-tony' of git://gitorious.org/linux-omap-dss2/linux into omap-for...
author
Tony Lindgren
<tony@atomide.com>
Wed, 23 Feb 2011 20:06:28 +0000
(12:06 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 23 Feb 2011 20:06:28 +0000
(12:06 -0800)
Conflicts:
arch/arm/mach-omap2/board-3430sdp.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff