tree 9412a38886bfad562bc5897c6e4c23bb88703204
parent 59136ef3c596606d3eef920dc3e0fdfa2ce52c6f
parent 4c5f830c4c9d4f19c1eef356c0cd322b46d695c9
author Russell King <rmk+kernel@arm.linux.org.uk> 1325768204 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1325768204 +0000

Merge branch 'restart-cleanup' into restart

Conflicts:
	arch/arm/kernel/setup.c