Skip to content
GitLab
Commit 34c453ce authored by Kukjin Kim's avatar Kukjin Kim
Browse files

ARM: S3C24XX: fix merge conflict 



Missed some changes during re-sorting this branch.
So fixed it.

Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 2916f9a2
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment