git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b23f46c bb07d75)
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)
* '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


Trivial merge
Pandora Kernel Repository