From: Tony Lindgren <tony@atomide.com>
Date: Wed, 10 Jun 2009 13:45:04 +0000 (+0300)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.32-omap1~11^2^2~1^2^2^2^2^2~8^2^2~18^2~2^2^2~2^2^2^2^2~16^2^2~8^2^2~7^2~81
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04cd52a12d59aa1d5ec3b2c5e920e998d3480234;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

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

04cd52a12d59aa1d5ec3b2c5e920e998d3480234
Reading git-diff-tree failed