Merge remote-tracking branch 'asoc/topic/wm2000' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 12 Apr 2013 12:57:27 +0000 (13:57 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 12 Apr 2013 12:57:27 +0000 (13:57 +0100)

Trivial merge