Merge changes Ibb65d718,I5619b14f into msm-3.4

* changes:
  arm/dt: msm8974: Add device tree for MSM8974 CDP
  thermal: tsens8974: Fix NULL pointer dereference