git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fac3d35
eff4c74
)
ARM: Merge for-2635-4/s5pv210-boards
author
Ben Dooks
<ben-linux@fluff.org>
Thu, 20 May 2010 09:55:32 +0000
(18:55 +0900)
committer
Ben Dooks
<ben-linux@fluff.org>
Thu, 20 May 2010 09:55:32 +0000
(18:55 +0900)
Merge branch 'for-2635-4/s5pv210-boards' into for-2635-4/partial1
Conflicts:
arch/arm/mach-s5pv210/include/mach/map.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff