diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-05 15:01:09 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-05 15:01:09 +1100 |
| commit | 32165b5ad1f88636cf5b7768cbf33cea74989211 (patch) | |
| tree | 018f1658fbdf5e4f574ae1a41f340550ea4303ad /MAINTAINERS | |
| parent | 06c7e40704205b3d4eca1c0b92e2dd4d8d684efd (diff) | |
| parent | 0731572b6c529f8e8a320dc4df6d67d9a595ecf3 (diff) | |
Merge remote-tracking branch 'char-misc/char-misc-next'
Conflicts:
drivers/ipack/devices/ipoctal.c
drivers/mfd/wm5102-tables.c
include/linux/mfd/arizona/pdata.h
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3b4d6bf30d54..45a060cb9b2e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5564,6 +5564,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 |