git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2916f9a)
ARM: S3C24XX: fix merge conflict
authorKukjin Kim <kgene.kim@samsung.com>
Thu, 8 May 2014 20:51:43 +0000 (05:51 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Wed, 14 May 2014 20:54:38 +0000 (05:54 +0900)
Missed some changes during re-sorting this branch.
So fixed it.

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
arch/arm/mach-s3c24xx/Kconfig patch | blob | history

diff --cc arch/arm/mach-s3c24xx/Kconfig
Simple merge
Pandora Kernel Repository