Merge tag 'v3.18.10' into msm-3.18

Linux 3.18.10

Resolve a trivial context conflict in xhci-plat.c as part
of the merge resolution.

Conflicts:
	drivers/usb/host/xhci-plat.c

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