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

Trivial merge