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
This commit is contained in:
Arnd Bergmann 2012-01-03 20:27:56 +00:00
commit 038485ea9b
9 changed files with 74 additions and 22 deletions