Merge remote-tracking branch 'asoc/topic/symmetry' into asoc-core
authorMark Brown <broonie@linaro.org>
Wed, 4 Dec 2013 11:54:29 +0000 (11:54 +0000)
committerMark Brown <broonie@linaro.org>
Wed, 4 Dec 2013 11:54:29 +0000 (11:54 +0000)
commit07ac582c85ead1b972232560832c26fec09dfe04
tree1ad64014dd6a5c898cdd9438844b630977d5e0ed
parent0b4bbae85e046042af76a65920db4bb5509c97bd
parent62e5f676f6a063e1ab0d6b8fcaef2feb026ee00e
Merge remote-tracking branch 'asoc/topic/symmetry' into asoc-core

Conflicts (Trivial add/delete):
sound/soc/soc-pcm.c
sound/soc/soc-pcm.c