Merge branch 'qcom/soc2' into next/soc
authorKevin Hilman <khilman@linaro.org>
Fri, 10 Jan 2014 19:43:30 +0000 (11:43 -0800)
committerKevin Hilman <khilman@linaro.org>
Fri, 10 Jan 2014 19:43:36 +0000 (11:43 -0800)
* qcom/soc2:
  ARM: msm_defconfig: Update for multi-platform

Signed-off-by: Kevin Hilman <khilman@linaro.org>

Trivial merge