Merge remote-tracking branch 'asoc/fix/pxa' into tmp
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 10 Jan 2013 12:22:16 +0000 (12:22 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 10 Jan 2013 12:22:16 +0000 (12:22 +0000)

Trivial merge