From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 5 Jan 2012 12:56:44 +0000 (+0000)
Subject: Merge branch 'restart-cleanup' into restart
X-Git-Tag: v3.3-rc1~144^2^2~54
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4045407fd7740642b18bc802e8bab064e79a61e5;p=pandora-kernel.git

Merge branch 'restart-cleanup' into restart

Conflicts:
	arch/arm/kernel/setup.c
---

4045407fd7740642b18bc802e8bab064e79a61e5
Reading git-diff-tree failed