Merge branch 'topic/drvdata-fix' into topic/asoc