Skip to content
Commit 4045407f authored by Russell King's avatar Russell King
Browse files

Merge branch 'restart-cleanup' into restart

Conflicts:
	arch/arm/kernel/setup.c
parents 59136ef3 4c5f830c
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment