Merge remote branch 'takashi/topic/asoc' into for-2.6.36