From: Kukjin Kim <kgene.kim@samsung.com>
Date: Thu, 8 May 2014 20:51:43 +0000 (+0900)
Subject: ARM: S3C24XX: fix merge conflict
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~39^2~45^2~7^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34c453ce16633539a94a2e876faeb731ac1be899;p=pandora-kernel.git

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-diff-tree failed