git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a3307ea
4bec628
)
Merge branch 'omap-fixes'
author
Tony Lindgren
<tony@atomide.com>
Tue, 7 Apr 2009 23:36:16 +0000
(16:36 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 7 Apr 2009 23:36:16 +0000
(16:36 -0700)
Conflicts:
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-rx51.c
drivers/mmc/host/omap_hsmmc.c
Trivial merge