Merge remote-tracking branch 'asoc/fix/kirkwood' into asoc-linus
authorMark Brown <broonie@linaro.org>
Wed, 11 Sep 2013 10:17:16 +0000 (11:17 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 11 Sep 2013 10:17:16 +0000 (11:17 +0100)

Trivial merge