Merge branch 'features/imx3' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc

* 'features/imx3' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: mx3: Setup AIPS registers
  ARM: mx3: Let mx31 and mx35 enter in LPM mode in WFI

Conflicts:
	arch/arm/mach-imx/mm-imx3.c
This commit is contained in:
Arnd Bergmann 2012-03-02 15:04:47 +00:00
commit cb66bb1d6f
6 changed files with 78 additions and 2 deletions