Merge branch 'topic/oxygen' into for-linus

* topic/oxygen:
  sound: oxygen: work around MCE when changing volume