Merge remote-tracking branches 'asoc/fix/88pm860', 'asoc/fix/omap' and 'asoc/fix...
authorMark Brown <broonie@linaro.org>
Mon, 10 Mar 2014 11:30:56 +0000 (11:30 +0000)
committerMark Brown <broonie@linaro.org>
Mon, 10 Mar 2014 11:30:56 +0000 (11:30 +0000)

Trivial merge