From: Grazvydas Ignotas <notasas@gmail.com>
Date: Mon, 8 Dec 2008 21:54:33 +0000 (+0200)
Subject: Fix merge error in omap-mcbsp
X-Git-Tag: Release-2010-05/1~2^2~181
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd5031623c51905b757b3ede43d8a639fda2d7e9;p=pandora-kernel.git

Fix merge error in omap-mcbsp
---

Reading git-diff-tree failed