git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f18ea82
92b118f
)
ARM: Merge next-s3c64xx-updates
author
Ben Dooks
<ben-linux@fluff.org>
Thu, 3 Dec 2009 21:53:10 +0000
(21:53 +0000)
committer
Ben Dooks
<ben-linux@fluff.org>
Thu, 3 Dec 2009 21:53:10 +0000
(21:53 +0000)
Merge branch 'next-s3c64xx-updates' into for-rmk
Conflicts:
arch/arm/plat-s3c/dev-hsmmc2.c
arch/arm/plat-s3c/include/plat/sdhci.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff