From: Tony Lindgren <tony@atomide.com>
Date: Mon, 20 Jun 2005 20:57:17 +0000 (-0700)
Subject: Manual merge to avoid conflicts
X-Git-Tag: v2.6.13-omap1~114
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce016ca206b225a332948e3c4c926581e5d3e122;p=pandora-kernel.git

Manual merge to avoid conflicts
---

Reading git-diff-tree failed