Merge tag 'v3.18.5' into msm-3.18

This is the 3.18.5 stable release

Resolve a conflict due to similar (but not identical)
array-out-of-bounds fixes in pinctrl-msm.c made upstream
and internally. Keep the upstream version.

Conflicts:
	drivers/pinctrl/qcom/pinctrl-msm.c

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