Merge tag 'v3.18.4' into msm-3.18

This is the 3.18.4 stable release

Resolve a handful of context conflicts with local
changes as part of the merge resolution.

Conflicts:
	drivers/clk/clk.c
	drivers/usb/dwc3/gadget.c

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