git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2bfc96a
e9c93c1
)
Merge cbus
author
Tony Lindgren
<tony@atomide.com>
Mon, 30 Aug 2010 15:56:41 +0000
(08:56 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 30 Aug 2010 15:56:41 +0000
(08:56 -0700)
Conflicts:
arch/arm/mach-omap2/board-n8x0.c
Trivial merge