Merge remote-tracking branches 'asoc/topic/au1x', 'asoc/topic/bcm2835', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:52:41 +0000 (15:52 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:52:41 +0000 (15:52 +0100)

Trivial merge