Commit 084c473c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pwm/for-6.9-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux 

Pull maintainer entry update from Uwe Kleine-König:
 "This is just an update to my maintainer entries as I will switch jobs
  soon. Getting a contact email address into the MAINTAINERS file that
  will work also after my switch will hopefully reduce people mailing to
  the then non-existing address.

  I also drop my co-maintenance for SIOX, but that continues to be in
  good hands"

* tag 'pwm/for-6.9-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux:
  MAINTAINERS: Update Uwe's email address, drop SIOX maintenance
parents 61ef6208 190f1f46

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -17872,7 +17872,7 @@ F: Documentation/devicetree/bindings/leds/irled/pwm-ir-tx.yaml 
F:	drivers/media/rc/pwm-ir-tx.c









PWM SUBSYSTEM









M:	Uwe Kleine-König <u.kleine-koenig@pengutronix.de>









M:	Uwe Kleine-König <ukleinek@kernel.org>









L:	linux-pwm@vger.kernel.org









S:	Maintained









Q:	https://patchwork.ozlabs.org/project/linux-pwm/list/








@@ -20176,7 +20176,6 @@ F:	include/linux/platform_data/simplefb.h















SIOX









M:	Thorsten Scherer <t.scherer@eckelmann.de>









M:	Uwe Kleine-König <u.kleine-koenig@pengutronix.de>









R:	Pengutronix Kernel Team <kernel@pengutronix.de>









S:	Supported









F:	drivers/gpio/gpio-siox.c