Merge remote-tracking branches 'asoc/fix/ac97', 'asoc/fix/atmel', 'asoc/fix/intel...
authorMark Brown <broonie@kernel.org>
Wed, 4 Feb 2015 20:56:58 +0000 (20:56 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 4 Feb 2015 20:56:58 +0000 (20:56 +0000)

Trivial merge