tree b429984fc589be87e50de205a2385cee475c1770
parent 8ef2292edbe50c432c5aa816e8add7d2ce6e894c
parent a14d982962c1c3caee99ddeea632d97fc851ea60
author Mark Brown <broonie@linaro.org> 1377178131 +0100
committer Mark Brown <broonie@linaro.org> 1377178131 +0100

Merge remote-tracking branch 'asoc/topic/sta32x' into asoc-next