From: Tony Lindgren <tony@atomide.com>
Date: Tue, 13 Sep 2005 10:32:45 +0000 (+0300)
Subject: ARM: OMAP: Fixed merge conflicts
X-Git-Tag: v2.6.14-rc1-omap1~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abc9491df2d5c50f6851f7f50f04d35014585789;p=pandora-kernel.git

ARM: OMAP: Fixed merge conflicts

Fixed merge conflicts
---

Reading git-diff-tree failed