Merge tag 'v3.18.3' into msm-3.18

This is the 3.18.3 stable release

Resolve a handful of trivial context conflicts with local
changes as part of the merge resolution.

Conflicts:
	arch/arm64/kernel/efi.c
	arch/arm64/kernel/setup.c
	arch/arm64/kernel/sleep.S
	drivers/mmc/host/sdhci.c

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