Merge changes Ibda5134d,I6749ae20,I2d7bbdd2,I7f2e4b47,I13db77e7,I6d650240,I49f80855 into msm-3.0

* changes:
  msm: rpm: Update usage of cpu_is_msm8960 for 8930
  msm: subsystem_restart: Update usage of cpu_is_msm8960 for 8930
  msm: diag: Update usage of cpu_is_msm8960 for 8930
  msm: kgsl: Update usage of cpu_is_msm8960 for 8930
  msm: smd: Update usage of cpu_is_msm8960 for 8930
  msm: modem-8960: Update usage of cpu_is_msm8960 for 8930
  msm: acpuclock-8960: Update usage of cpu_is_msm8960 for 8930