Merge remote-tracking branch 'lsk/v3.10/topic/arm64-fpsimd' into arm64-v3.10

Conflicts:
	arch/arm64/Kconfig
	arch/arm64/kernel/fpsimd.c