From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 5 Jan 2012 13:25:15 +0000 (+0000)
Subject: Merge branch 'restart' into for-linus
X-Git-Tag: v3.3-rc1~176^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b9dd47136c07ffd883aff6926c7b281e4c1eea4;p=pandora-kernel.git

Merge branch 'restart' into for-linus

Conflicts:
	arch/arm/mach-exynos/cpu.c

The changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c.
---

7b9dd47136c07ffd883aff6926c7b281e4c1eea4
Reading git-diff-tree failed