From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 3 Jan 2012 20:27:56 +0000 (+0000)
Subject: Merge branch 'imx6/pm' into next/pm
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=038485ea9b66858c17f82e5393004532825106a7;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.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