]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
projects / thirdparty / kernel / stable.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2916f9a) | 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)
commit34c453ce16633539a94a2e876faeb731ac1be899
treecbd8013079b316cc796044f7cb28d9b5a907ade5tree | snapshot
parent2916f9a2c6d9200b4c840a613cd1fa1dad04240fcommit | 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 | blame | history
Mirror https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git