Merge changes Ia7fb4359,Id6893ded into msm-3.4

* changes:
  coresight: disable ETM probe for Krait pass3
  msm: socinfo: Add support for detecting Krait Pass 3