Merge tag 'pinctrl-v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[uclinux-h8/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 0a23427..fefe315 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9353,7 +9353,6 @@ F:        drivers/media/platform/atmel/atmel-isc-regs.h
 F:     devicetree/bindings/media/atmel-isc.txt
 
 MICROCHIP / ATMEL NAND DRIVER
-M:     Wenyou Yang <wenyou.yang@microchip.com>
 M:     Josh Wu <rainyfeeling@outlook.com>
 L:     linux-mtd@lists.infradead.org
 S:     Supported
@@ -11264,7 +11263,7 @@ F:      Documentation/devicetree/bindings/pinctrl/fsl,*
 
 PIN CONTROLLER - INTEL
 M:     Mika Westerberg <mika.westerberg@linux.intel.com>
-M:     Heikki Krogerus <heikki.krogerus@linux.intel.com>
+M:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 S:     Maintained
 F:     drivers/pinctrl/intel/
 
@@ -14063,6 +14062,13 @@ M:     Laxman Dewangan <ldewangan@nvidia.com>
 S:     Supported
 F:     drivers/input/keyboard/tegra-kbc.c
 
+TEGRA NAND DRIVER
+M:     Stefan Agner <stefan@agner.ch>
+M:     Lucas Stach <dev@lynxeye.de>
+S:     Maintained
+F:     Documentation/devicetree/bindings/mtd/nvidia-tegra20-nand.txt
+F:     drivers/mtd/nand/raw/tegra_nand.c
+
 TEGRA PWM DRIVER
 M:     Thierry Reding <thierry.reding@gmail.com>
 S:     Supported