Merge remote-tracking branches 'asoc/fix/fsl-mxs-saif' and 'asoc/fix/sunxi' into...
authorMark Brown <broonie@kernel.org>
Sun, 19 Feb 2017 16:35:37 +0000 (16:35 +0000)
committerMark Brown <broonie@kernel.org>
Sun, 19 Feb 2017 16:35:37 +0000 (16:35 +0000)

Trivial merge