From: Tony Lindgren <tony@atomide.com>
Date: Wed, 25 Jun 2008 11:13:30 +0000 (+0300)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.26-omap1~104
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af933cd32a5e14f119a4acb4fe20055f6f8ab1aa;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'
---

af933cd32a5e14f119a4acb4fe20055f6f8ab1aa
Reading git-diff-tree failed