From 34c453ce16633539a94a2e876faeb731ac1be899 Mon Sep 17 00:00:00 2001
From: Kukjin Kim <kgene.kim@samsung.com>
Date: Fri, 9 May 2014 05:51:43 +0900
Subject: [PATCH] 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>
---
Reading git-format-patch failed