From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 20 Dec 2011 23:22:05 +0000 (+1100)
Subject: Merge remote-tracking branch 'i.MX/for-next'
X-Git-Tag: next-20111221~99
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=126f92ac18ced20fffa46235d19aa4911b6dc483;p=karo-tx-linux.git

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

Conflicts:
	arch/arm/mach-imx/clock-imx35.c
	arch/arm/mach-imx/clock-mx51-mx53.c
	arch/arm/mach-imx/devices-imx53.h
	arch/arm/mach-imx/mm-imx5.c
	arch/arm/mach-mx5/Kconfig
	arch/arm/mach-mx5/Makefile
	arch/arm/mach-mx5/pm-imx5.c
	arch/arm/plat-mxc/include/mach/hardware.h
---

126f92ac18ced20fffa46235d19aa4911b6dc483