git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f2b7e3c
1c739c7
)
Merge branch 'next-samsung' into for-next
author
Kukjin Kim
<kgene.kim@samsung.com>
Fri, 6 Aug 2010 12:49:18 +0000
(21:49 +0900)
committer
Kukjin Kim
<kgene.kim@samsung.com>
Fri, 6 Aug 2010 12:49:18 +0000
(21:49 +0900)
Conflicts:
arch/arm/mach-s5p6440/Kconfig
arch/arm/mach-s5p6442/Kconfig
arch/arm/mach-s5pc100/Kconfig
arch/arm/mach-s5pv210/Kconfig
arch/arm/mach-s5pv210/cpu.c
arch/arm/plat-samsung/include/plat/sdhci.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff