From: Mark Brown <broonie@linaro.org>
Date: Thu, 22 Aug 2013 13:28:48 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/topic/s6000' into asoc-next
X-Git-Tag: firefly_0821_release~176^2~4889^2~176^2~24
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3f151cbf76ab5d60abd0d3f8b777a50722b64ccb;p=firefly-linux-kernel-4.4.55.git

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

3f151cbf76ab5d60abd0d3f8b777a50722b64ccb