tree 1ad64014dd6a5c898cdd9438844b630977d5e0ed
parent 0b4bbae85e046042af76a65920db4bb5509c97bd
parent 62e5f676f6a063e1ab0d6b8fcaef2feb026ee00e
author Mark Brown <broonie@linaro.org> 1386158069 +0000
committer Mark Brown <broonie@linaro.org> 1386158069 +0000

Merge remote-tracking branch 'asoc/topic/symmetry' into asoc-core

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