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

This commit is contained in:
Arnd Bergmann 2012-01-03 20:21:52 +00:00
commit 8b69791215
9 changed files with 74 additions and 22 deletions