git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e9c93c1
7d5ee5a
)
Merge omap-testing
author
Tony Lindgren
<tony@atomide.com>
Tue, 3 Aug 2010 09:18:22 +0000
(12:18 +0300)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 3 Aug 2010 09:18:22 +0000
(12:18 +0300)
Conflicts:
arch/arm/mach-omap2/board-n8x0.c
Trivial merge