Merge tag 'v3.18.7' into msm-3.18

This is the 3.18.7 stable release

Resolve a couple trivial context conflicts with local changes
as part of the merge resolution. These relate to upstream change
1fb32679 ("arm64: Fix up /proc/cpuinfo"), which removes the
printing of machine_name in cpuinfo, and conflicts with local
changes to how machine_name was printed.

Conflicts:
	arch/arm64/kernel/setup.c

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