From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 1 Aug 2011 01:39:42 +0000 (+1000)
Subject: Merge remote-tracking branch 'arm-soc/for-next'
X-Git-Tag: next-20110801~66
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ceb072020c4772eba7f3f9bc426384dc1dd3e183;p=karo-tx-linux.git

Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
	arch/arm/mach-exynos4/pm.c
	arch/arm/mach-imx/mm-imx25.c
	arch/arm/mach-imx/mm-imx31.c
	arch/arm/mach-imx/mm-imx35.c
	arch/arm/mach-mx5/mm.c
	arch/arm/mach-omap2/cm-regbits-44xx.h
---

ceb072020c4772eba7f3f9bc426384dc1dd3e183