Merge remote-tracking branches 'asoc/fix/ac97', 'asoc/fix/atmel', 'asoc/fix/intel...
authorMark Brown <broonie@kernel.org>
Mon, 9 Feb 2015 07:09:49 +0000 (15:09 +0800)
committerMark Brown <broonie@kernel.org>
Mon, 9 Feb 2015 07:09:49 +0000 (15:09 +0800)

Trivial merge