From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 26 Jul 2011 01:26:30 +0000 (+1000)
Subject: Merge remote-tracking branch 'i.MX/for-next'
X-Git-Tag: next-20110726~86
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=83f2170c015d9deb70acc7aa2c589ed0dd8a19c7;p=karo-tx-linux.git

Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
	arch/arm/mach-imx/mach-mx27_3ds.c
	arch/arm/mach-imx/mm-imx1.c
	arch/arm/mach-imx/mm-imx21.c
	arch/arm/mach-imx/mm-imx25.c
	arch/arm/mach-imx/mm-imx27.c
	arch/arm/mach-imx/mm-imx31.c
	arch/arm/mach-imx/mm-imx35.c
	arch/arm/mach-mx5/mm.c
---

83f2170c015d9deb70acc7aa2c589ed0dd8a19c7