Merge tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[~andy/linux] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index eac5eda526406f653bfe3cb48d5663e592f6b15e..f5b9851755a24d8f59001746d3dbd05e6997ad87 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5405,6 +5405,13 @@ S:       Maintained
 F:     Documentation/scsi/NinjaSCSI.txt
 F:     drivers/scsi/nsp32*
 
+NTB DRIVER
+M:     Jon Mason <jon.mason@intel.com>
+S:     Supported
+F:     drivers/ntb/
+F:     drivers/net/ntb_netdev.c
+F:     include/linux/ntb.h
+
 NTFS FILESYSTEM
 M:     Anton Altaparmakov <anton@tuxera.com>
 L:     linux-ntfs-dev@lists.sourceforge.net