Merge remote-tracking branch 'asoc/topic/devm' into asoc-samsung
authorMark Brown <broonie@linaro.org>
Mon, 16 Sep 2013 23:50:44 +0000 (00:50 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 16 Sep 2013 23:50:44 +0000 (00:50 +0100)

Trivial merge