Merge remote-tracking branches 'asoc/fix/ak4642', 'asoc/fix/atmel', 'asoc/fix/cs4271...
authorMark Brown <broonie@kernel.org>
Sun, 12 Apr 2015 18:48:22 +0000 (19:48 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 12 Apr 2015 18:48:22 +0000 (19:48 +0100)

Trivial merge