From: Tony Lindgren <tony@atomide.com>
Date: Tue, 6 Oct 2009 02:06:27 +0000 (-0700)
Subject: Merge pm-fixes-32 into master
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~15^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d9e3f7149964db34f7b4ccb3cd2b42605792531;p=pandora-kernel.git

Merge pm-fixes-32 into master

Merge branch 'master' into pm-fixes-32
---

7d9e3f7149964db34f7b4ccb3cd2b42605792531
Reading git-diff-tree failed