From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 16 Oct 2012 02:25:39 +0000 (+1100)
Subject: Merge remote-tracking branch 'samsung/for-next'
X-Git-Tag: next-20121016~8
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3051ae9f34e2c13dcbf366f06f9a4d670d7962b0;p=karo-tx-linux.git

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

Conflicts:
	arch/arm/mach-exynos/clock-exynos5.c
---

3051ae9f34e2c13dcbf366f06f9a4d670d7962b0