]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'imx6/pm' into next/pm
authorArnd Bergmann <arnd@arndb.de>
Tue, 3 Jan 2012 20:27:56 +0000 (20:27 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 3 Jan 2012 20:27:56 +0000 (20:27 +0000)
commit038485ea9b66858c17f82e5393004532825106a7
treee411be1686e4ed73c4f74f0388410231d26e5c76
parent5d3cb0ffdd0c8987dc17a2ef4529b246198ceb72
parent8b69791215857e3e885d27b3945759ace820794a
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
arch/arm/plat-mxc/include/mach/common.h