Merge branch 'fix/opl3sa2-suspend' into for-linus