git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
84eb9ec
ef2f07d
)
ARM: Merge for-2635-4/spi-devs
author
Ben Dooks
<ben-linux@fluff.org>
Thu, 20 May 2010 10:40:24 +0000
(19:40 +0900)
committer
Ben Dooks
<ben-linux@fluff.org>
Thu, 20 May 2010 10:40:24 +0000
(19:40 +0900)
Merge branch 'for-2635-4/spi-devs' into for-2635-4/partial2
Conflicts:
arch/arm/mach-s5pc100/include/mach/map.h
arch/arm/mach-s5pv210/Makefile
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff