Merge changes Iabed55b7,I7236834c into msm-3.0

* changes:
  defconfig: msm8960: Enable PID saving in contextidr
  ARM: mm: update CONTEXTIDR register to contain PID of current process