Merge remote-tracking branches 'asoc/fix/axi', 'asoc/fix/cs4265', 'asoc/fix/da732x...
authorMark Brown <broonie@kernel.org>
Tue, 2 Sep 2014 22:33:39 +0000 (23:33 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 2 Sep 2014 22:33:39 +0000 (23:33 +0100)

Trivial merge