Merge remote-tracking branch 'asoc/fix/sgtl5000' into asoc-linus
authorMark Brown <broonie@kernel.org>
Thu, 5 Feb 2015 19:34:40 +0000 (19:34 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 5 Feb 2015 19:34:40 +0000 (19:34 +0000)

Trivial merge