From: Olof Johansson Date: Fri, 6 Jan 2012 20:44:05 +0000 (-0800) Subject: Merge branch 'imx/pm2' of git://git.linaro.org/people/shawnguo/linux-2.6 into imx6/pm X-Git-Tag: firefly_0821_release~3680^2~3789^2^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7996bad8e62d8ca5888a935185ce313e693814b2;p=firefly-linux-kernel-4.4.55.git Merge branch 'imx/pm2' of git://git.linaro.org/people/shawnguo/linux-2.6 into imx6/pm --- 7996bad8e62d8ca5888a935185ce313e693814b2