Merge tag 'v3.18.18' into msm-3.18

Linux 3.18.18

Resolve trivial context conflicts as part of the merge.

Conflicts:
	drivers/usb/dwc3/gadget.c

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