Merge remote-tracking branch 'asoc/topic/pxa' into asoc-next
authorMark Brown <broonie@kernel.org>
Fri, 27 May 2016 12:45:35 +0000 (13:45 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 27 May 2016 12:45:35 +0000 (13:45 +0100)

Trivial merge