Merge tag 'dax-misc-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm...

[deliverable/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index f27ff1b3275721bad423257857661486bb4c6b2c..81e9c984d2f368fe390623e3fce9662999521ee5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4993,6 +4993,7 @@ F:        drivers/scsi/gdt*
 
 GDB KERNEL DEBUGGING HELPER SCRIPTS
 M:     Jan Kiszka <jan.kiszka@siemens.com>
+M:     Kieran Bingham <kieran@bingham.xyz>
 S:     Supported
 F:     scripts/gdb/
 
@@ -8038,6 +8039,7 @@ NILFS2 FILESYSTEM
 M:     Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
 L:     linux-nilfs@vger.kernel.org
 W:     http://nilfs.sourceforge.net/
+W:     http://nilfs.osdn.jp/
 T:     git git://github.com/konis/nilfs2.git
 S:     Supported
 F:     Documentation/filesystems/nilfs2.txt
@@ -8879,6 +8881,7 @@ F:        arch/*/kernel/*/perf_event*.c
 F:     arch/*/kernel/*/*/perf_event*.c
 F:     arch/*/include/asm/perf_event.h
 F:     arch/*/kernel/perf_callchain.c
+F:     arch/*/events/*
 F:     tools/perf/
 
 PERSONALITY HANDLING
@@ -11293,6 +11296,7 @@ F:      drivers/platform/x86/thinkpad_acpi.c
 
 TI BANDGAP AND THERMAL DRIVER
 M:     Eduardo Valentin <edubezval@gmail.com>
+M:     Keerthy <j-keerthy@ti.com>
 L:     linux-pm@vger.kernel.org
 L:     linux-omap@vger.kernel.org
 S:     Maintained
@@ -12343,6 +12347,7 @@ L:      linux-watchdog@vger.kernel.org
 W:     http://www.linux-watchdog.org/
 T:     git git://www.linux-watchdog.org/linux-watchdog.git
 S:     Maintained
+F:     Documentation/devicetree/bindings/watchdog/
 F:     Documentation/watchdog/
 F:     drivers/watchdog/
 F:     include/linux/watchdog.h