Merge remote-tracking branch 'asoc/topic/tpa6130a2' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 15 Dec 2012 14:56:46 +0000 (23:56 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 15 Dec 2012 14:56:46 +0000 (23:56 +0900)

Trivial merge