From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 9 Aug 2011 23:36:39 +0000 (+1000)
Subject: Merge remote-tracking branch 's5p/for-next'
X-Git-Tag: next-20110810~67
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c02fdb10299a7bd5730df87cd3c2293c574f8696;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
---

c02fdb10299a7bd5730df87cd3c2293c574f8696