Merge tag 'v3.18.13' into msm-3.18

Linux 3.18.13

Resolve trivial context conflicts as part of the merge.

Conflicts:
	arch/arm64/include/asm/cpufeature.h
	arch/arm64/include/asm/io.h
	arch/arm64/kernel/cpuinfo.c
	arch/arm64/kernel/setup.c

Change-Id: I483193553f4eea677865c9d5f8c46bd53b906e27
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>