Merge remote branch 'takashi/fix/asoc' into for-2.6.32
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 1 Oct 2009 10:33:26 +0000 (11:33 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 1 Oct 2009 10:33:26 +0000 (11:33 +0100)

Trivial merge