From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 2 Mar 2012 15:04:47 +0000 (+0000)
Subject: Merge branch 'features/imx3' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc
X-Git-Tag: v3.4-rc1~89^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb66bb1d6fab2d91960c20f256c6986d5afac1a1;p=pandora-kernel.git

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
---

cb66bb1d6fab2d91960c20f256c6986d5afac1a1
Reading git-diff-tree failed