Merge branch 'qcom/fixes' into next/fixes-non-critical

* qcom/fixes:
  ARM: msm: trout: fix uninit var warning

Signed-off-by: Olof Johansson <olof@lixom.net>