From: Tony Lindgren <tony@atomide.com>
Date: Wed, 3 Jun 2009 17:05:50 +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~119
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=151c7a7fc30cceb58e7999adbf3ad5e0c734b4a7;p=pandora-kernel.git

Merge current mainline tree into linux-omap tree

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

151c7a7fc30cceb58e7999adbf3ad5e0c734b4a7
Reading git-diff-tree failed