Merge commit 'takashi/fix/asoc' into for-2.6.30
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 23 Apr 2009 09:33:47 +0000 (10:33 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 23 Apr 2009 09:33:47 +0000 (10:33 +0100)

Trivial merge