Merge branches 'topic/fix/misc' and 'topic/fix/asoc' into for-linus