From: Tony Lindgren <tony@atomide.com>
Date: Mon, 13 Feb 2006 17:50:03 +0000 (-0800)
Subject: ARM: OMAP: Fix merge conflicts manually
X-Git-Tag: v2.6.16-omap1~63^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e176ed0fa84626aa47362016c06bd6f0c073af41;p=pandora-kernel.git

ARM: OMAP: Fix merge conflicts manually

Fix merge conflicts manually
---

Reading git-diff-tree failed