From: Kevin Hilman <khilman@linaro.org>
Date: Fri, 10 Jan 2014 19:43:30 +0000 (-0800)
Subject: Merge branch 'qcom/soc2' into next/soc
X-Git-Tag: v3.14-rc1~113^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5494bd2d2f40b4118d587f542aaeb6bafad6f22b;p=thirdparty%2Flinux.git

Merge branch 'qcom/soc2' into next/soc

* qcom/soc2:
  ARM: msm_defconfig: Update for multi-platform

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

5494bd2d2f40b4118d587f542aaeb6bafad6f22b