From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Nov 2011 02:05:33 +0000 (+1100)
Subject: Merge remote-tracking branch 'i.MX/for-next'
X-Git-Tag: next-20111103~76
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4f69aab7cdb41527f48461cea8878b0abf6fc444;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
---

4f69aab7cdb41527f48461cea8878b0abf6fc444