Merge remote-tracking branches 'asoc/topic/88pm860x', 'asoc/topic/ad1836', 'asoc...
authorMark Brown <broonie@linaro.org>
Wed, 12 Mar 2014 23:04:09 +0000 (23:04 +0000)
committerMark Brown <broonie@linaro.org>
Wed, 12 Mar 2014 23:04:09 +0000 (23:04 +0000)

Trivial merge