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

Merge remote-tracking branch 's5p/for-next'

Conflicts:
	arch/arm/mach-exynos4/Kconfig
	arch/arm/mach-exynos4/mach-smdkc210.c
---

fc8a90fef867dd4c4776681f4bd5b8a5eaafec6e