Merge tag 'v3.12-pwm-cleanup-for-olof' of git://github.com/tom3q/linux into next...