Merge branch 'imx/pm2' of git://git.linaro.org/people/shawnguo/linux-2.6 into imx6/pm
authorOlof Johansson <olof@lixom.net>
Fri, 6 Jan 2012 20:44:05 +0000 (12:44 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 6 Jan 2012 20:44:05 +0000 (12:44 -0800)
1  2 
arch/arm/mach-imx/head-v7.S

Simple merge