Merge commit 'takashi/topic/asoc' into for-2.6.30
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 10 Mar 2009 15:42:03 +0000 (15:42 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 10 Mar 2009 15:42:03 +0000 (15:42 +0000)

Trivial merge