Merge commit 'takashi/topic/asoc' into for-2.6.31