git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a4a4ba3
f788aa0
)
Merge branch 'omap_sparse_fixesv2' of git://dev.omapzoom.org/pub/scm/manju/kernel...
author
Tony Lindgren
<tony@atomide.com>
Tue, 5 Oct 2010 01:39:04 +0000
(18:39 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 5 Oct 2010 01:39:04 +0000
(18:39 -0700)
Conflicts:
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/control.c
arch/arm/plat-omap/sram.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff