Merge remote-tracking branches 'asoc/topic/bcm2835', 'asoc/topic/cs42l56', 'asoc...
authorMark Brown <broonie@kernel.org>
Fri, 13 May 2016 13:26:43 +0000 (14:26 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 13 May 2016 13:26:43 +0000 (14:26 +0100)

Trivial merge