fix minor merge fails.

Change-Id: I71a61f4fc3f5c07805ae6af91971c6c9ae000188
Revert "PM / devfreq: governor_bw_hwmon: Add suspend/resume support"

This reverts commit f3eba990b3e48290188c5af043dd1120a4a9e5be.
Revert "devfreq: Backport MSM devfreq features from 3.10"

This reverts commit 3bfaa8b9ff6666bea1e2b73e6c1552a20262297a.
Revert backported devfreq DT changes.

Change-Id: I1d0d3640c57f07368c90ec1bb7b96119bdde30a1
Revert "cpufreq: Cumulative cpufreq update."

This reverts commit 8f4d5cfc3b7b8206e7f4499c534d9a194ae957f8.
Revert "input: Removed touch boost."

This reverts commit 989ffa1ba4891926e3583e192312459582b5a47a.
Revert "soc: qcom: rq_stats: remove the redundant iowait check"

This reverts commit 7ffdc6cb008fa72384e07042f6bf964fcc34dd50.
Revert "cpufreq: Move get_cpu_idle_time() to cpufreq.c"

This reverts commit 4a31af6da498d86c7525d55f296e50f679aa3ead.
Fix build after reverts. Update defconfig.

Change-Id: I27d075bf79392f94114702715897e1f2e933664c
Merge branch into kk_mkt