From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 3 Jan 2012 20:21:52 +0000 (+0000)
Subject: Merge branch 'imx/pm' of git://git.linaro.org/people/shawnguo/linux-2.6 into imx6/pm
X-Git-Tag: v3.3-rc1~137^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b69791215857e3e885d27b3945759ace820794a;p=pandora-kernel.git

Merge branch 'imx/pm' of git://git.linaro.org/people/shawnguo/linux-2.6 into imx6/pm
---

8b69791215857e3e885d27b3945759ace820794a
Reading git-diff-tree failed