From: Arnd Bergmann Date: Tue, 3 Jan 2012 20:27:56 +0000 (+0000) Subject: Merge branch 'imx6/pm' into next/pm X-Git-Tag: firefly_0821_release~3680^2~3789^2~1 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=038485ea9b66858c17f82e5393004532825106a7;p=firefly-linux-kernel-4.4.55.git Merge branch 'imx6/pm' into next/pm * imx6/pm: ARM: imx6q: resume PL310 only when CACHE_L2X0 defined ARM: imx6q: build pm code only when CONFIG_PM selected ARM: mx5: use generic irq chip pm interface for pm functions on --- 038485ea9b66858c17f82e5393004532825106a7