Merge remote-tracking branch 'asoc/topic/ml26124' into asoc-next
authorMark Brown <broonie@linaro.org>
Fri, 8 Nov 2013 10:43:31 +0000 (10:43 +0000)
committerMark Brown <broonie@linaro.org>
Fri, 8 Nov 2013 10:43:31 +0000 (10:43 +0000)

Trivial merge