git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4a374e2
bf71df9
)
Merge branch 'for-tony-mailbox'
author
Tony Lindgren
<tony@atomide.com>
Mon, 22 Dec 2008 15:27:47 +0000
(17:27 +0200)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 22 Dec 2008 15:27:47 +0000
(17:27 +0200)
Conflicts:
arch/arm/plat-omap/Kconfig
arch/arm/plat-omap/include/mach/omap34xx.h
arch/arm/plat-omap/mailbox.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff