Merge branch 'restart-cleanup' into restart

author Russell King <rmk+kernel@arm.linux.org.uk>

Mon, 21 Nov 2011 09:49:47 +0000 (09:49 +0000)

committer Russell King <rmk+kernel@arm.linux.org.uk>

Mon, 21 Nov 2011 09:49:47 +0000 (09:49 +0000)
author Russell King <rmk+kernel@arm.linux.org.uk>
Mon, 21 Nov 2011 09:49:47 +0000 (09:49 +0000)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Mon, 21 Nov 2011 09:49:47 +0000 (09:49 +0000)
diff --cc arch/arm/mach-iop32x/include/mach/system.h
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 21 Nov 2011 09:49:47 +0000 (09:49 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 21 Nov 2011 09:49:47 +0000 (09:49 +0000)