ARM: arm-soc: Merge branch 'next/pm2' into next/pm
authorOlof Johansson <olof@lixom.net>
Thu, 13 Dec 2012 00:10:45 +0000 (16:10 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 13 Dec 2012 00:10:45 +0000 (16:10 -0800)
Another smaller branch merged into next/pm before pull request.

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge