Merge branch 'features/imx3' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc
authorArnd Bergmann <arnd@arndb.de>
Fri, 2 Mar 2012 15:04:47 +0000 (15:04 +0000)
committerArnd Bergmann <arnd@arndb.de>
Fri, 2 Mar 2012 15:04:47 +0000 (15:04 +0000)
commitcb66bb1d6fab2d91960c20f256c6986d5afac1a1
tree08bec33c473e85de9478b68cb1f3fbc1e6ebef07
parentb23f46c7471d0adcf81092b6702299562c4149c5
parentbb07d7511e0884f913a0610d5f9a2f8a27914042
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
arch/arm/mach-imx/mm-imx3.c