Merge commit 'takashi/fix/asoc' into for-2.6.30