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

Merge current mainline tree into linux-omap tree

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

eff80244b451e89c12b7d0bbabc6df3654621346
Reading git-diff-tree failed