Merge remote-tracking branches 'asoc/fix/rt5640' and 'asoc/fix/wm8962' into asoc...
authorMark Brown <broonie@kernel.org>
Tue, 26 Apr 2016 18:25:18 +0000 (19:25 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 26 Apr 2016 18:25:18 +0000 (19:25 +0100)

Trivial merge