From: Tony Lindgren <tony@atomide.com>
Date: Thu, 8 May 2008 17:50:38 +0000 (-0700)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.26-omap1~123^2~131
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb170dcdce58de20b045ae964a4ccfc29aad1647;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

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

cb170dcdce58de20b045ae964a4ccfc29aad1647
Reading git-diff-tree failed