From: Tony Lindgren <tony@atomide.com>
Date: Tue, 17 Jun 2008 10:46:24 +0000 (+0300)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.26-omap1~123
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b97d3ec6732c87741b2fc04f2956f097a458818;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

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

5b97d3ec6732c87741b2fc04f2956f097a458818
Reading git-diff-tree failed