From: Tony Lindgren <tony@atomide.com>
Date: Thu, 10 Sep 2009 19:42:37 +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~23
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52a962f09ab2306a2ac6e22c2d3bac1a76ac8993;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

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

52a962f09ab2306a2ac6e22c2d3bac1a76ac8993
Reading git-diff-tree failed