Merge remote-tracking branch 'asoc/topic/wm2000' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 2 Dec 2012 04:35:17 +0000 (13:35 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 2 Dec 2012 04:35:17 +0000 (13:35 +0900)

Trivial merge