Merge remote-tracking branch 'asoc/topic/pxa' into asoc-next
authorMark Brown <broonie@linaro.org>
Thu, 22 Aug 2013 13:28:46 +0000 (14:28 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 22 Aug 2013 13:28:46 +0000 (14:28 +0100)

Trivial merge