Merge remote branch 'takashi/fix/asoc' into for-2.6.37
Mark Brown [Wed, 3 Nov 2010 16:32:54 +0000 (12:32 -0400)]

Trivial merge