S2W fixing cmdline interfacing

Conflicts:
	arch/arm/mach-msm/cpufreq.c
	include/net/cfg80211.h