git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b30a3f6
9edd6d7
)
Merge cbus
author
Tony Lindgren
<tony@atomide.com>
Fri, 24 Sep 2010 01:32:15 +0000
(18:32 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 24 Sep 2010 01:32:15 +0000
(18:32 -0700)
Conflicts:
arch/arm/mach-omap2/board-n8x0.c
Trivial merge