Merge remote branch 'takashi/topic/asoc' into for-2.6.36
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 30 Jun 2010 13:46:53 +0000 (14:46 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 30 Jun 2010 13:46:53 +0000 (14:46 +0100)

Trivial merge