Merge 4c7d00cc ("Merge tag 'pwm/for-5.6-rc1' of...

Merge 4c7d00cc ("Merge tag 'pwm/for-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm"

) into android-mainline.

This resolves the pwm merge issues with 5.6-rc1.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie479409535c5fa80046dede9bba4f06b889d8399