Merge branch 'qcom/fixes' into next/fixes-non-critical
authorOlof Johansson <olof@lixom.net>
Thu, 2 Jan 2014 18:23:24 +0000 (10:23 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 2 Jan 2014 18:23:24 +0000 (10:23 -0800)
* qcom/fixes:
  ARM: msm: trout: fix uninit var warning

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

Trivial merge