Merge remote-tracking branch 'tip/auto-latest'

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c5d063515c0ea568030e412080c67976fff35942..766078aab074e6439f27a12e584343850c727052 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8106,6 +8106,12 @@ S:       Maintained
 F:     Documentation/blockdev/ramdisk.txt
 F:     drivers/block/brd.c
 
+PERSISTENT MEMORY DRIVER
+M:     Ross Zwisler <ross.zwisler@linux.intel.com>
+L:     linux-nvdimm@lists.01.org
+S:     Supported
+F:     drivers/block/pmem.c
+
 RANDOM NUMBER DRIVER
 M:     "Theodore Ts'o" <tytso@mit.edu>
 S:     Maintained