diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-14 13:54:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-14 13:54:12 -0400 |
commit | 02c1be3d0c308c8a817bd3cc47fd75c843bf1a46 (patch) | |
tree | ab381685a8d03590de2245f3cdc3bc5a117f0afd /MAINTAINERS | |
parent | 8ac19f0d90f7de0e78b08770ba2eabd29ad2cb9e (diff) | |
parent | 3cc5ba1938eea0de372a41d1687c8030049c5e8f (diff) |
Merge tag 'ntb-3.17' of git://github.com/jonmason/ntb
Pull ntb driver bugfixes from Jon Mason:
"NTB driver fixes for queue spread and buffer alignment. Also, update
to MAINTAINERS to reflect new e-mail address"
* tag 'ntb-3.17' of git://github.com/jonmason/ntb:
ntb: Add alignment check to meet hardware requirement
MAINTAINERS: update NTB info
NTB: correct the spread of queues over mw's
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 97e92d9dc470..809ecd680d88 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -6424,7 +6424,8 @@ F: Documentation/scsi/NinjaSCSI.txt | |||
6424 | F: drivers/scsi/nsp32* | 6424 | F: drivers/scsi/nsp32* |
6425 | 6425 | ||
6426 | NTB DRIVER | 6426 | NTB DRIVER |
6427 | M: Jon Mason <jon.mason@intel.com> | 6427 | M: Jon Mason <jdmason@kudzu.us> |
6428 | M: Dave Jiang <dave.jiang@intel.com> | ||
6428 | S: Supported | 6429 | S: Supported |
6429 | W: https://github.com/jonmason/ntb/wiki | 6430 | W: https://github.com/jonmason/ntb/wiki |
6430 | T: git git://github.com/jonmason/ntb.git | 6431 | T: git git://github.com/jonmason/ntb.git |