Merge changes Ie846e1d0,I11ee1a07 into msm-3.4

* changes:
  power: pm8921-charger: reject vbus calls after checking vbat
  msm: platsmp: Update Krait release sequence for 8960AB