Merge changes I83459fea,Ie2a6ff30,I647ca194 into msm-3.4

* changes:
  defconfig: msm8960-perf: Enable ERP event logging
  defconfig: msm8960: Enable ERP event logging
  msm: cache_erp: Use dedicated location for ERP event logging