Merge tag 'ntb-3.17' of git://github.com/jonmason/ntb
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Sep 2014 17:54:12 +0000 (10:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Sep 2014 17:54:12 +0000 (10:54 -0700)
commit02c1be3d0c308c8a817bd3cc47fd75c843bf1a46
treeab381685a8d03590de2245f3cdc3bc5a117f0afd
parent8ac19f0d90f7de0e78b08770ba2eabd29ad2cb9e
parent3cc5ba1938eea0de372a41d1687c8030049c5e8f
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
MAINTAINERS