Merge remote-tracking branches 'asoc/fix/max98371', 'asoc/fix/nau8825', 'asoc/fix...
authorMark Brown <broonie@kernel.org>
Wed, 24 Aug 2016 18:05:25 +0000 (19:05 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 24 Aug 2016 18:05:25 +0000 (19:05 +0100)

Trivial merge