git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5dd62cc
63d5fc0
)
Merge branch 'omap-for-v3.8/board-v2' into omap-for-v3.8/tmp-merge
author
Tony Lindgren
<tony@atomide.com>
Fri, 9 Nov 2012 23:29:44 +0000
(15:29 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 9 Nov 2012 23:29:44 +0000
(15:29 -0800)
Conflicts:
arch/arm/mach-omap2/board-omap4panda.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff