Merge branch 'pwm/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek...

# Conflicts:
#	MAINTAINERS

diff --cc MAINTAINERS
index 48ba7ded0f38351515090ae8b40cff6b60c11d90,26ef29a0c9bf82a935d700df59b077b5b418a011..df89aa8f1539159631e43c205880c3b71997571e
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3494,9 -3427,8 +3494,10 @@@ M:     Alexey Charkov <alchark@gmail.com
  M:    Krzysztof Kozlowski <krzk@kernel.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Odd Fixes
 -F:    Documentation/devicetree/bindings/i2c/i2c-wmt.txt
 +F:    Documentation/devicetree/bindings/hwinfo/via,vt8500-scc-id.yaml
 +F:    Documentation/devicetree/bindings/i2c/wm,wm8505-i2c.yaml
 +F:    Documentation/devicetree/bindings/interrupt-controller/via,vt8500-intc.yaml
+ F:    Documentation/devicetree/bindings/pwm/via,vt8500-pwm.yaml
  F:    arch/arm/boot/dts/vt8500/
  F:    arch/arm/mach-vt8500/
  F:    drivers/clocksource/timer-vt8500.c