Merge commit 'takashi/topic/asoc' into for-2.6.31
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 5 May 2009 09:12:55 +0000 (10:12 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 5 May 2009 09:12:55 +0000 (10:12 +0100)

Trivial merge