diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-14 14:15:13 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-14 14:15:13 +1100 |
| commit | 4501fdc6a1fe6719254a399c4940285a9cada5eb (patch) | |
| tree | 733af589f840bf8d5c069f3de9cf3ec2a4970af0 /MAINTAINERS | |
| parent | 37b5947817c76d85b4dc6da20f34b2c5bc605479 (diff) | |
| parent | 19d3243e797c2abc02a214d3cec9fefa5dc048ff (diff) | |
Merge remote-tracking branch 'char-misc/char-misc-next'
Conflicts:
drivers/char/pcmcia/synclink_cs.c
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 bad0291e000c..b37fa8b1c385 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5595,6 +5595,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 |