Merge remote-tracking branches 'asoc/fix/intel', 'asoc/fix/jz4740', 'asoc/fix/rcar...
authorMark Brown <broonie@linaro.org>
Tue, 22 Apr 2014 21:01:07 +0000 (22:01 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 22 Apr 2014 21:01:07 +0000 (22:01 +0100)

Trivial merge