Merge remote-tracking branches 'asoc/fix/sgtl5000' and 'asoc/fix/sn95031' into asoc...
authorMark Brown <broonie@kernel.org>
Mon, 16 Mar 2015 12:03:17 +0000 (12:03 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 16 Mar 2015 12:03:17 +0000 (12:03 +0000)

Trivial merge