git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
985dbcb
e6cb736
)
Merge branch 'omap-pool'
author
Tony Lindgren
<tony@atomide.com>
Fri, 3 Apr 2009 23:33:04 +0000
(16:33 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 3 Apr 2009 23:33:04 +0000
(16:33 -0700)
Conflicts:
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-rx51.c
Trivial merge