Merge tag 'v3.18.6' into msm-3.18

This is the 3.18.6 stable release

Resolve conflicts in arch_timer code related to inclusion of the
local change 22953ce9 ("ARM: arch_timer: resurrect cntpct for
MSM users") and upstream change b2f21d1b ("clocksource: arch_timer:
Only use the virtual counter (CNTVCT) on arm64"), as well as a
trivial context conflict in soc-compress.c.

Conflicts:
	drivers/clocksource/arm_arch_timer.c
	sound/soc/soc-compress.c

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