From: Tony Lindgren <tony@atomide.com>
Date: Fri, 7 Apr 2006 20:42:31 +0000 (-0700)
Subject: Manual merge with mainline
X-Git-Tag: v2.6.17-omap1~101^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3870564b37989d1fe95cf746a63413403f27792f;p=pandora-kernel.git

Manual merge with mainline

As noted by Komal Shah
---

Reading git-diff-tree failed