git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
db3c94a
e90a0f3
)
Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2
author
Kukjin Kim
<kgene.kim@samsung.com>
Tue, 4 Oct 2011 11:20:08 +0000
(20:20 +0900)
committer
Kukjin Kim
<kgene.kim@samsung.com>
Tue, 4 Oct 2011 11:20:08 +0000
(20:20 +0900)
Conflicts:
arch/arm/plat-s5p/include/plat/pll.h
1
2
arch/arm/mach-s3c2416/clock.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-s3c64xx/clock.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-s3c64xx/cpu.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-s3c64xx/mach-crag6410.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-s3c64xx/mach-smdk6410.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/plat-samsung/include/plat/exynos4.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/mach-s3c2416/clock.c
Simple merge
diff --cc
arch/arm/mach-s3c64xx/clock.c
Simple merge
diff --cc
arch/arm/mach-s3c64xx/cpu.c
Simple merge
diff --cc
arch/arm/mach-s3c64xx/mach-crag6410.c
Simple merge
diff --cc
arch/arm/mach-s3c64xx/mach-smdk6410.c
Simple merge
diff --cc
arch/arm/plat-samsung/include/plat/exynos4.h
Simple merge
git.openpandora.org / pandora-kernel.git / commitdiff