Merge remote-tracking branch 'asoc/fix/ep93xx' into asoc-linus
authorMark Brown <broonie@linaro.org>
Tue, 23 Jul 2013 18:17:08 +0000 (19:17 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 23 Jul 2013 18:17:08 +0000 (19:17 +0100)

Trivial merge