Merge remote-tracking branch 'asoc/fix/blackfin' into asoc-linus
authorMark Brown <broonie@linaro.org>
Wed, 20 Nov 2013 15:20:30 +0000 (15:20 +0000)
committerMark Brown <broonie@linaro.org>
Wed, 20 Nov 2013 15:20:30 +0000 (15:20 +0000)

Trivial merge