Merge remote-tracking branches 'asoc/topic/sta529', 'asoc/topic/sti', 'asoc/topic...

diff --combined sound/soc/Kconfig
index 9df9658b552b8d91e124d2eba0b785db0a5c4edb,182d92efc7c80166edea6374456df776aa8079e9,182d92efc7c80166edea6374456df776aa8079e9,3836ebe8938f663dfa414f8890c670a73ff1a02e,182d92efc7c80166edea6374456df776aa8079e9,182d92efc7c80166edea6374456df776aa8079e9..c0abad2067e14a07feb3eee54209a3467517040c
--- 1/sound/soc/Kconfig
--- 2/sound/soc/Kconfig
--- 3/sound/soc/Kconfig
--- 4/sound/soc/Kconfig
--- 5/sound/soc/Kconfig
--- 6/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@@@@@@ -47,7 -47,6 -47,6 -47,6 -47,6 -47,6 +47,7 @@@@@@@ source "sound/soc/cirrus/Kconfig
      source "sound/soc/davinci/Kconfig"
      source "sound/soc/dwc/Kconfig"
      source "sound/soc/fsl/Kconfig"
 +++++source "sound/soc/hisilicon/Kconfig"
      source "sound/soc/jz4740/Kconfig"
      source "sound/soc/nuc900/Kconfig"
      source "sound/soc/omap/Kconfig"
@@@@@@@ -64,6 -63,6 -63,6 -63,7 -63,6 -63,6 +64,7 @@@@@@@ source "sound/soc/sh/Kconfig
      source "sound/soc/sirf/Kconfig"
      source "sound/soc/spear/Kconfig"
      source "sound/soc/sti/Kconfig"
+++ ++source "sound/soc/stm/Kconfig"
      source "sound/soc/sunxi/Kconfig"
      source "sound/soc/tegra/Kconfig"
      source "sound/soc/txx9/Kconfig"

diff --combined sound/soc/Makefile
index 2f6aabb8b4c3437456e3c35f060d50d26c153050,9a30f21d16ee8efb2ddfcb84e757245e1b395bee,9a30f21d16ee8efb2ddfcb84e757245e1b395bee,5440cf77c39ae85a7fffa9b0ec12f0b00201a621,9a30f21d16ee8efb2ddfcb84e757245e1b395bee,9a30f21d16ee8efb2ddfcb84e757245e1b395bee..39c27a58158db38c3f4db2a72af842747f7ef830
--- 1/sound/soc/Makefile
--- 2/sound/soc/Makefile
--- 3/sound/soc/Makefile
--- 4/sound/soc/Makefile
--- 5/sound/soc/Makefile
--- 6/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@@@@@@ -27,7 -27,6 -27,6 -27,6 -27,6 -27,6 +27,7 @@@@@@@ obj-$(CONFIG_SND_SOC) += cirrus
      obj-$(CONFIG_SND_SOC)     += davinci/
      obj-$(CONFIG_SND_SOC)     += dwc/
      obj-$(CONFIG_SND_SOC)     += fsl/
 +++++obj-$(CONFIG_SND_SOC)     += hisilicon/
      obj-$(CONFIG_SND_SOC)     += jz4740/
      obj-$(CONFIG_SND_SOC)     += img/
      obj-$(CONFIG_SND_SOC)     += intel/
@@@@@@@ -44,6 -43,6 -43,6 -43,7 -43,6 -43,6 +44,7 @@@@@@@ obj-$(CONFIG_SND_SOC) += sh
      obj-$(CONFIG_SND_SOC)     += sirf/
      obj-$(CONFIG_SND_SOC)     += spear/
      obj-$(CONFIG_SND_SOC)     += sti/
+++ ++obj-$(CONFIG_SND_SOC)     += stm/
      obj-$(CONFIG_SND_SOC)     += sunxi/
      obj-$(CONFIG_SND_SOC)     += tegra/
      obj-$(CONFIG_SND_SOC)     += txx9/