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
Merge remote-tracking branch 'Lollipop/cm-12.0' into lp-devel1
Merge remote-tracking branch 'aktoronto/lp-devel1' into lp-dev1

Conflicts:
	arch/arm/configs/ville_defconfig