Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 18 Apr 2013 14:05:28 +0000 (15:05 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 18 Apr 2013 14:05:28 +0000 (15:05 +0100)

Trivial merge