Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android

Conflicts:
	arch/arm64/Kconfig
	arch/arm64/include/asm/cputype.h
	arch/arm64/kernel/Makefile
	arch/arm64/kernel/armv8_deprecated.c
	arch/arm64/kernel/cpuinfo.c