From 6ac5af6ec12dadca37dd86f93a4125f6a04ffb4c Mon Sep 17 00:00:00 2001 From: Ludovic Desroches Date: Thu, 8 Nov 2018 14:14:42 +0100 Subject: MAINTAINERS: merge at91 pinctrl entries In order to be aware of all changes related to at91 pinctrl drivers, merge the two entries. Make use of the opportunity to replace Atmel by Microchip. Signed-off-by: Ludovic Desroches Signed-off-by: Linus Walleij --- MAINTAINERS | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 98452d5ee215..0e19c056befc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11703,18 +11703,12 @@ F: Documentation/driver-api/pinctl.rst F: drivers/pinctrl/ F: include/linux/pinctrl/ -PIN CONTROLLER - ATMEL AT91 -M: Jean-Christophe Plagniol-Villard -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -S: Maintained -F: drivers/pinctrl/pinctrl-at91.* - -PIN CONTROLLER - ATMEL AT91 PIO4 +PIN CONTROLLER - MICROCHIP AT91 M: Ludovic Desroches L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-gpio@vger.kernel.org S: Supported -F: drivers/pinctrl/pinctrl-at91-pio4.* +F: drivers/pinctrl/pinctrl-at91* PIN CONTROLLER - FREESCALE M: Dong Aisheng -- cgit v1.2.3