git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2e2ec95
ce491cf
)
Merge branch '7xx-iosplit-plat' with omap-fixes
author
Tony Lindgren
<tony@atomide.com>
Fri, 30 Oct 2009 18:50:00 +0000
(11:50 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 30 Oct 2009 18:50:00 +0000
(11:50 -0700)
Conflicts:
arch/arm/mach-omap1/serial.c
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/board-omap3pandora.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-omap2/board-rx51.c
arch/arm/mach-omap2/board-zoom2.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff