fix comflicting flags
Revert "Fix derp"

This reverts commit 2614b1d1f31ed0650729f4cea3d4415d68cc3dbc.
Revert "galbi: Updates for recent PM changes"

This reverts commit 61f6c09dfb90b536bd7fc0480bfa466de0edce39.

kernel/lge/msm8974/arch/arm/mach-msm/lge/board-8974-g2-com.c:223:2: error: implicit declaration of function ‘msm_pm_sleep_status_init’ [-Werror=implicit-function-declaration]
  msm_pm_sleep_status_init();
defconfig
mach-msm: cpufreq: remove deprecated early_suspend drivers

--pretains to intellidemand

Signed-off-by: Paul Reioux <reioux@gmail.com>