Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 23 Apr 2013 18:25:29 +0000 (19:25 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 23 Apr 2013 18:25:29 +0000 (19:25 +0100)

Trivial merge