Merge remote-tracking branch 'asoc/fix/ux500' into asoc-linus
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 14 May 2013 12:53:20 +0000 (16:53 +0400)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 14 May 2013 12:53:20 +0000 (16:53 +0400)

Trivial merge