git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0ae9a22
fa353e9
)
Merge branch 'next-s5pv310' into for-next
author
Kukjin Kim
<kgene.kim@samsung.com>
Fri, 31 Dec 2010 01:52:05 +0000
(10:52 +0900)
committer
Kukjin Kim
<kgene.kim@samsung.com>
Fri, 31 Dec 2010 01:52:05 +0000
(10:52 +0900)
Conflicts:
arch/arm/mach-s5pv310/Kconfig
arch/arm/mach-s5pv310/Makefile
arch/arm/mach-s5pv310/mach-smdkc210.c
arch/arm/mach-s5pv310/mach-smdkv310.c
arch/arm/plat-samsung/include/plat/devs.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff