summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-23 14:00:59 +0000
committerMark Brown <broonie@linaro.org>2014-03-23 14:00:59 +0000
commite090d5b6ad20056ec0ef58727e3ae95fd82be090 (patch)
treed3f77e535d58ef84c2e3c4aee8d20266b9c6ba94 /sound
parentca9e54c625911cb9c409687d96e78645cf55fa33 (diff)
parent46c39cae292fd691f32e573e6c2c854e36614c93 (diff)
parentbfe723f6eae285e399615d99f297d1646a6253fe (diff)
Merge remote-tracking branches 'asoc/topic/simple' and 'asoc/topic/sirf' into asoc-next