Merge remote-tracking branch 'asoc/topic/da7213' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 14 Feb 2013 17:28:00 +0000 (17:28 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 14 Feb 2013 17:28:00 +0000 (17:28 +0000)

Trivial merge