Merge remote-tracking branch 'upstream11/cm-11.0' into kk-devel5
Revert "Revert "array subscript out of bounds fix""

This reverts commit e3f50805168635cbb61eea69fe18af54b0db30d9.
defconfig - version bump
Minor change runque and timing thresholds in mpdec to reflect 2 cores
Revert "Fix error with MSM_DCVS now that MPDEC was added"

This reverts commit d53deae7d9e44d2acdcccab89856c2a5ff65774d.
defconfig: Disable ShowP MPdecision
Move to Faux123 Intelliplug
Intelliplug update to https://github.com/faux123/htc-m7/commit/44d5bf7e2de8b4972d4b917fa8fec554e8631a2c
revert old arch/arm/mach-msm/ mpdec to original CM version
intelli_plug: refactor stats calculation code to be less intrusive
Intelli_plug: kernel sched/core: add per cpu nr_running stats
Intelli_plug: kernel sched/core: add per cpu nr_running stats
put back some missing code for this: https://github.com/CyanogenMod/android_kernel_htc_msm8960/commit/fe9a0d032a38012de574eed70a98c1385b23a4a1
defconfig version bump
enable intelliplug by default
Merge remote-tracking branch 'aktoronto/kk-devel5' into kk-dev6

Conflicts:
	arch/arm/configs/ville_defconfig