tree 09ba4bd0c4b5938d56fe680916174b511a7e8a9f
parent 5c8a0fbba543d9428a486f0d1282bbcf3cf1d95a
author Kukjin Kim <kgene.kim@samsung.com> 1320458934 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1320510724 -0700

ARM: EXYNOS4: Fix the merge conflict

The mark of conflict should be removed.

This happened at the commit fba9569924e0 ("Merge branch 'next' of
git://git.infradead.org/users/vkoul/slave-dma")

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
[ I always check the conflict resolution with "git diff" before I add
  the result, but I clearly missed that this time, and didn't notice the
  second conflict in that file after having fixed the first one.
  Oops, my bad.      - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>