From: Kukjin Kim <kgene.kim@samsung.com>
Date: Sat, 5 Nov 2011 02:08:54 +0000 (+0900)
Subject: ARM: EXYNOS4: Fix the merge conflict
X-Git-Tag: v3.2-rc1~45
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc822e57ee05856291a8c9324d2309076ee5f5e2;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed