Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/sta32x', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Mon, 9 Feb 2015 07:10:29 +0000 (15:10 +0800)
committerMark Brown <broonie@kernel.org>
Mon, 9 Feb 2015 07:10:29 +0000 (15:10 +0800)
commit1bf9f29a05ed027dfc3527966321bda33a77ebc3
tree05c97c420ca49515051196ffc52716e8f5702a97
parentddaaeee0e598aa98b2e6a1847003c78665714926
parentf9911803e82a32c126c40dd6246ade2faf472cbc
parent3c9390ad0fa642f42e437feae1c75bdd21e8e1bc
parente46c93669349072f5caca853f5618cfa01b86008
parenta37f1b8fdc912600c24f9d0d45d7046e50a031e4
parentb8255930e0fbda841890ff6bb7154aa5fd62e143
Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/sta32x', 'asoc/topic/tdm-slot', 'asoc/topic/tegra' and 'asoc/topic/tlv320aic3x' into asoc-next
sound/soc/codecs/Kconfig
sound/soc/codecs/tlv320aic3x.c
sound/soc/fsl/eukrea-tlv320.c
sound/soc/fsl/fsl_ssi.c
sound/soc/fsl/wm1133-ev1.c
sound/soc/generic/simple-card.c
sound/soc/soc-core.c