]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0afdf3e) | patch
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)
commit066c319d23c01d685b2d4eaad8063b1d031164e2
treecbd8013079b316cc796044f7cb28d9b5a907ade5tree | snapshot
parent0afdf3ea7021c1771c2349e9e8b50ece9681a186commit | diff
ARM: S3C24XX: fix merge conflict

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 diff | blob | history
Linux Kernel Source Tree.