Merge branch 'for-4.7/pwm-cleanup' into for-next