From: Tony Lindgren <tony@atomide.com>
Date: Tue, 6 Sep 2005 10:21:36 +0000 (+0300)
Subject: ARM: OMAP: Manual merge of conflicts
X-Git-Tag: v2.6.14-rc1-omap1~9
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e4f6337780c31a28f394097feadf1ca3dddc105;p=pandora-kernel.git

ARM: OMAP: Manual merge of conflicts

Manual merge of conflicts
---

Reading git-diff-tree failed