From: Tony Lindgren <tony@atomide.com>
Date: Wed, 29 Jun 2005 14:01:01 +0000 (-0700)
Subject: ARM: OMAP: Temporary patch to avoid merge conflicts
X-Git-Tag: v2.6.13-omap1~96
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1244aa95507c27ecd7660eaa62a535f2a1b24e2;p=pandora-kernel.git

ARM: OMAP: Temporary patch to avoid merge conflicts

Temporary patch to avoid merge conflicts
---

Reading git-diff-tree failed