Merge branch 'zImage_fixes' of git://git.linaro.org/people/nico/linux into devel...

author Russell King <[email protected]>

Sat, 7 May 2011 07:34:02 +0000 (08:34 +0100)

committer Russell King <[email protected]>

Sat, 7 May 2011 07:34:02 +0000 (08:34 +0100)
author Russell King <[email protected]>
Sat, 7 May 2011 07:34:02 +0000 (08:34 +0100)
committer Russell King <[email protected]>
Sat, 7 May 2011 07:34:02 +0000 (08:34 +0100)
diff --cc arch/arm/boot/compressed/head.S
Simple merge
diff --cc arch/arm/boot/compressed/misc.c
Simple merge
author	Russell King <[email protected]>
	Sat, 7 May 2011 07:34:02 +0000 (08:34 +0100)
committer	Russell King <[email protected]>
	Sat, 7 May 2011 07:34:02 +0000 (08:34 +0100)
		1	2
arch/arm/boot/compressed/head.S	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/compressed/misc.c	patch \|	diff1 \|	diff2 \|	blob \| history