From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 28 Jul 2011 01:03:43 +0000 (+1000)
Subject: Merge remote-tracking branch 's5p/for-next'
X-Git-Tag: next-20110728~69
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=30b7b791077928e92c7743e62727eaaaa7b2b9c0;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
---

30b7b791077928e92c7743e62727eaaaa7b2b9c0