Merge tag 'v3.18.11' into msm-3.18

Linux 3.18.11

Resolve straight-forward conflicts in dma-mapping.c to
make room for the upstream change 0ef78141 ("arm64:
Honor __GFP_ZERO in dma allocations")

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

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