Merge remote-tracking branches 'asoc/topic/atmel', 'asoc/topic/bcm2835' and 'asoc...
authorMark Brown <broonie@kernel.org>
Sun, 13 Mar 2016 08:16:53 +0000 (15:16 +0700)
committerMark Brown <broonie@kernel.org>
Sun, 13 Mar 2016 08:16:53 +0000 (15:16 +0700)

Trivial merge