Merge remote-tracking branches 'asoc/fix/arizona', 'asoc/fix/atmel', 'asoc/fix/fsl...
authorMark Brown <broonie@linaro.org>
Tue, 3 Dec 2013 18:09:00 +0000 (18:09 +0000)
committerMark Brown <broonie@linaro.org>
Tue, 3 Dec 2013 18:09:00 +0000 (18:09 +0000)

Trivial merge