Merge branch 'topic/misc' into for-next

Generic updates for sound 3.6