Merge tag 'v3.18.14' into msm-3.18

Linux 3.18.14

Resolve a conflict between the local commit 07c17f4e ("arm64: add
support for NO_KERNEL_MAPPING and STRONGLY_ORDERED") and upstream
a142e964 ("arm64: dma-mapping: always clear allocated buffers")
by moving the memset(addr, 0, size) in __dma_alloc_coherent() to a
point before where the mapping of addr is removed.

Conflicts:
	arch/arm64/mm/dma-mapping.c

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