Learn more about cloning repositories
You have read-only access
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>
