Merge remote-tracking branches 'asoc/fix/rt5677', 'asoc/fix/simple', 'asoc/fix/ts3a22...
authorMark Brown <broonie@kernel.org>
Mon, 26 Jan 2015 11:29:58 +0000 (11:29 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 26 Jan 2015 11:29:58 +0000 (11:29 +0000)

Trivial merge