From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 May 2025 09:03:25 +0000 (+1000)
Subject: Merge branch 'pwm/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek... 
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=034cb96ba6e034eaa045524fb73966eafdabbc73;p=users%2Fhch%2Fmisc.git

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

# Conflicts:
#	MAINTAINERS
---

034cb96ba6e034eaa045524fb73966eafdabbc73
diff --cc MAINTAINERS
index 48ba7ded0f38,26ef29a0c9bf..df89aa8f1539
--- a/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