From: Tony Lindgren <tony@atomide.com>
Date: Thu, 5 Jun 2008 21:49:16 +0000 (-0700)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.26-omap1~123^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bbf8f7b69276626ed9bab406a4a2e59709b27d7;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

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

3bbf8f7b69276626ed9bab406a4a2e59709b27d7
Reading git-diff-tree failed