Merge remote-tracking branches 'asoc/fix/atmel', 'asoc/fix/compress', 'asoc/fix/core...
authorMark Brown <broonie@kernel.org>
Sun, 28 Sep 2014 11:25:12 +0000 (12:25 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 28 Sep 2014 11:25:12 +0000 (12:25 +0100)

Trivial merge