Merge branch 'google-common/android-3.18' into msm-3.18

Catch up to the tip of the android-3.18 kernel.

Conflicts were encountered in cpufreq_interactive.c due to
changes being picked up in different orders on the two
branches and msm-3.18 having some changes android-3.18 did
not. Resolve this by taking the msm-3.18 version of the
drivers, which includes 'everything'.

Also resolve a handful of "defined but not used" warnings in
drivers/usb/gadget/configfs.c by fixing up some ifdef usage.

Conflicts:
	drivers/cpufreq/cpufreq_interactive.c

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