Merge remote-tracking branches 'asoc/topic/simple' and 'asoc/topic/sirf' into asoc...
authorMark Brown <broonie@linaro.org>
Sun, 23 Mar 2014 14:00:59 +0000 (14:00 +0000)
committerMark Brown <broonie@linaro.org>
Sun, 23 Mar 2014 14:00:59 +0000 (14:00 +0000)

Trivial merge