Merge branch 'restart-cleanup' into restart
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 21 Nov 2011 09:49:47 +0000 (09:49 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 21 Nov 2011 09:49:47 +0000 (09:49 +0000)
commit59136ef3c596606d3eef920dc3e0fdfa2ce52c6f
tree3f3b8ec46d57bcb61a2d794a1f21bd4df01728c9
parente879c862fb81b986095ae7a4676b2281c2f97957
parent3f1517a761905c55d1db71cb0afd359d74a76a6c
Merge branch 'restart-cleanup' into restart
arch/arm/mach-iop32x/include/mach/system.h