git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3c14bde
6d2b6c9
)
Merge branch 'devel-board' into tmp-merge
author
Tony Lindgren
<tony@atomide.com>
Mon, 9 Jul 2012 12:37:42 +0000
(
05:37
-0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 9 Jul 2012 12:37:42 +0000
(
05:37
-0700)
Conflicts:
arch/arm/mach-omap2/common-board-devices.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff