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)
commit8b69791215857e3e885d27b3945759ace820794a
tree667b61e18807b0fe2cb884c480d5933a5e4db19a
parent5f0a6e2d503896062f641639dacfe5055c2f593b
parent733d1724d7c5c79113d8063d3d9d93e8c80cea82
Merge branch 'imx/pm' of git://git.linaro.org/people/shawnguo/linux-2.6 into imx6/pm