One monster update to bring everything up to standards except /block/ folder

Conflicts:
	arch/arm/mach-msm/acpuclock-8064.c
	arch/arm/mach-msm/msm_rq_stats.c
	drivers/battery/max77693_charger.c
	drivers/gpu/msm/Kconfig
	drivers/gpu/msm/kgsl_pwrctrl.c
	drivers/gpu/msm/kgsl_pwrscale_trustzone.c
	drivers/input/keyboard/gpio_keys.c
	drivers/input/misc/pmic8xxx-pwrkey.c
	drivers/net/usb/rmnet_usb_ctrl.c
	drivers/power/pm8921-charger.c
	drivers/usb/misc/mdm_ctrl_bridge.c
	include/linux/cpufreq.h