Merge remote-tracking branch 'asoc/fix/pxa' into asoc-pxa
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 8 Jan 2013 11:29:45 +0000 (11:29 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 8 Jan 2013 11:29:45 +0000 (11:29 +0000)

Trivial merge