tree c1350e950209a9e7aaf082e54763108352ff603a
parent cce42f625ad498934db3d4a6ee2fa00f16fe056d
parent 4d94a44b356234b275e2f5f7d136d4e2192b5ec8
author Linux Build Service Account <lnxbuild@localhost> 1330202811 -0800
committer QuIC Gerrit Code Review <code-review@localhost> 1330202811 -0800

Merge changes Ib1f49cea,I4c14d8e6 into msm-3.0

* changes:
  thermal: msm8960_tsens: Fix string length
  hwmon: pm8xxx-adc: Fix error handling conditions