From: Tony Lindgren <tony@atomide.com>
Date: Fri, 28 Aug 2009 16:21:29 +0000 (-0700)
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~27
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3777b1e9ffb6e0901be93cbe201ae8e96003179b;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

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

3777b1e9ffb6e0901be93cbe201ae8e96003179b
Reading git-diff-tree failed