From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 15 Nov 2011 22:57:47 +0000 (+1100)
Subject: Merge remote-tracking branch 'i.MX/for-next'
X-Git-Tag: next-20111116~72
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b4406b91adc9ae28e550a49d2e4df89b1385aa11;p=karo-tx-linux.git

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

Conflicts:
	arch/arm/mach-mx5/clock-mx51-mx53.c
	arch/arm/mach-mx5/devices-imx53.h
	arch/arm/mach-mx5/mm.c
	arch/arm/plat-mxc/include/mach/hardware.h
---

b4406b91adc9ae28e550a49d2e4df89b1385aa11