diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-14 19:54:12 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-14 19:54:12 +0200 |
commit | 02c1be3d0c308c8a817bd3cc47fd75c843bf1a46 (patch) | |
tree | ab381685a8d03590de2245f3cdc3bc5a117f0afd /MAINTAINERS | |
parent | Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
parent | ntb: Add alignment check to meet hardware requirement (diff) | |
download | linux-02c1be3d0c308c8a817bd3cc47fd75c843bf1a46.tar.xz linux-02c1be3d0c308c8a817bd3cc47fd75c843bf1a46.zip |
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 F: drivers/scsi/nsp32* NTB DRIVER -M: Jon Mason <jon.mason@intel.com> +M: Jon Mason <jdmason@kudzu.us> +M: Dave Jiang <dave.jiang@intel.com> S: Supported W: https://github.com/jonmason/ntb/wiki T: git git://github.com/jonmason/ntb.git |