Merge remote-tracking branches 'asoc/topic/ad1836', 'asoc/topic/ad193x', 'asoc/topic...
authorMark Brown <broonie@linaro.org>
Thu, 2 Jan 2014 13:01:55 +0000 (13:01 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 2 Jan 2014 13:01:55 +0000 (13:01 +0000)

Trivial merge