From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 19 Mar 2012 20:52:33 +0000 (+0000)
Subject: Merge branch 'samsung/cleanup-exynos-clock' into next/soc
X-Git-Tag: v3.4-rc1~89^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bde755679a3ba5af0d16231f8532e8373c5e2ecc;p=pandora-kernel.git

Merge branch 'samsung/cleanup-exynos-clock' into next/soc

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

The cleanup moves the exynos4 clock implementation away, while
the other branch modifies the file with the old name.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

bde755679a3ba5af0d16231f8532e8373c5e2ecc
Reading git-diff-tree failed