Merge branch 'imx/pm' of git://git.linaro.org/people/shawnguo/linux-2.6 into imx6/pm
authorArnd Bergmann <arnd@arndb.de>
Tue, 3 Jan 2012 20:21:52 +0000 (20:21 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 3 Jan 2012 20:21:52 +0000 (20:21 +0000)

Trivial merge