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

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index e56cedcd01a0f59619967f68d1d9f44042e85905..954ba16a39ede82f949ad5580d7c445c812801d4 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5524,7 +5524,7 @@ M:        Luis R. Rodriguez <mcgrof@kernel.org>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 F:     Documentation/firmware_class/
-F:     drivers/base/firmware*.c
+F:     drivers/base/firmware_loader/
 F:     include/linux/firmware.h
 
 FLASH ADAPTER DRIVER (IBM Flash Adapter 900GB Full Height PCI Flash Card)
@@ -5984,7 +5984,7 @@ S:        Maintained
 F:     drivers/media/rc/gpio-ir-tx.c
 
 GPIO MOCKUP DRIVER
-M:     Bamvor Jian Zhang <bamvor.zhangjian@linaro.org>
+M:     Bamvor Jian Zhang <bamv2005@gmail.com>
 R:     Bartosz Golaszewski <brgl@bgdev.pl>
 L:     linux-gpio@vger.kernel.org
 S:     Maintained
@@ -5997,6 +5997,7 @@ L:        linux-gpio@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
 S:     Maintained
 F:     Documentation/devicetree/bindings/gpio/
+F:     Documentation/driver-api/gpio/
 F:     Documentation/gpio/
 F:     Documentation/ABI/testing/gpio-cdev
 F:     Documentation/ABI/obsolete/sysfs-gpio
@@ -6212,6 +6213,11 @@ F:       Documentation/hw_random.txt
 F:     drivers/char/hw_random/
 F:     include/linux/hw_random.h
 
+HARDWARE TRACING FACILITIES
+M:     Alexander Shishkin <alexander.shishkin@linux.intel.com>
+S:     Maintained
+F:     drivers/hwtracing/
+
 HARDWARE SPINLOCK CORE
 M:     Ohad Ben-Cohen <ohad@wizery.com>
 M:     Bjorn Andersson <bjorn.andersson@linaro.org>
@@ -8140,7 +8146,7 @@ F:        drivers/*/*/*pasemi*
 LINUX KERNEL DUMP TEST MODULE (LKDTM)
 M:     Kees Cook <keescook@chromium.org>
 S:     Maintained
-F:     drivers/misc/lkdtm*
+F:     drivers/misc/lkdtm/*
 
 LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)
 M:     Alan Stern <stern@rowland.harvard.edu>