Merge branch 'v3-removal' into for-linus

Conflicts:
	arch/arm/boot/compressed/head.S