From: Tony Lindgren <tony@atomide.com>
Date: Mon, 4 Sep 2006 14:55:16 +0000 (+0300)
Subject: Manual merge after pull from Linus' tree
X-Git-Tag: v2.6.18-omap1~93^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cb4dc2ed4ffda4e8e7ccc3e024aca883ebc7bc7;p=pandora-kernel.git

Manual merge after pull from Linus' tree
---

Reading git-diff-tree failed