Merge tag 'v3.18.2' into msm-3.18

This is the 3.18.2 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 82c236bc ("clocksource:
arch_timer: Fix code to use physical timers when requested"), as
well as a trivial context conflict in mmc/card/block.c.

Conflicts:
	arch/arm/include/asm/arch_timer.h
	arch/arm64/include/asm/arch_timer.h
	drivers/clocksource/arm_arch_timer.c
	drivers/mmc/card/block.c

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