Merge remote branch 'takashi/fix/asoc' into for-2.6.32