Merge remote-tracking branch 'asoc/fix/davinci' into asoc-linus
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 28 May 2013 14:41:36 +0000 (15:41 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 28 May 2013 14:41:36 +0000 (15:41 +0100)

Trivial merge