tree 08bec33c473e85de9478b68cb1f3fbc1e6ebef07
parent b23f46c7471d0adcf81092b6702299562c4149c5
parent bb07d7511e0884f913a0610d5f9a2f8a27914042
author Arnd Bergmann <arnd@arndb.de> 1330700687 +0000
committer Arnd Bergmann <arnd@arndb.de> 1330700687 +0000

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