diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-07 20:17:44 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-07 20:17:44 -0700 |
commit | c4c17252283a13c0d63a8d9df828da109c116411 (patch) | |
tree | 852a975068aeef7762a76f476b9cac3625ae6ad8 /MAINTAINERS | |
parent | 8de4651abe61c6b6a94a70a57ef163020fed05ee (diff) | |
parent | 73f47cadfe29f98c48d7fbac4dd79d3e7979ee0b (diff) | |
download | linux-c4c17252283a13c0d63a8d9df828da109c116411.tar.gz |
Merge tag 'ntb-3.12' of git://github.com/jonmason/ntb
Pull NTB (non-transparent bridge) updates from Jon Mason: "NTB driver bug fixes to address issues in NTB-RP enablement, spad, debugfs, and USD/DSD identification. Add a workaround on Xeon NTB devices for b2bdoorbell errata. Also, add new NTB driver features to support 32bit x86, DMA engine support, and NTB-RP support. Finally, a few clean-ups and update to MAINTAINERS for the NTB git tree and wiki location" * tag 'ntb-3.12' of git://github.com/jonmason/ntb: ntb: clean up unnecessary MSI/MSI-X capability find MAINTAINERS: Add Website and Git Tree for NTB NTB: Update Version NTB: Comment Fix NTB: Remove unused variable NTB: Remove References of non-B2B BWD HW NTB: NTB-RP support NTB: Rename Variables for NTB-RP NTB: Use DMA Engine to Transmit and Receive NTB: Enable 32bit Support NTB: Update Device IDs NTB: BWD Link Recovery NTB: Xeon Errata Workaround NTB: Correct debugfs to work with more than 1 NTB Device NTB: Correct USD/DSD Identification NTB: Correct Number of Scratch Pad Registers NTB: Add Error Handling in ntb_device_setup
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b6b29c38b6b6..99c6f35fb459 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5889,6 +5889,8 @@ F: drivers/scsi/nsp32* NTB DRIVER M: Jon Mason <jon.mason@intel.com> S: Supported +W: https://github.com/jonmason/ntb/wiki +T: git git://github.com/jonmason/ntb.git F: drivers/ntb/ F: drivers/net/ntb_netdev.c F: include/linux/ntb.h |