From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 14 Sep 2014 17:54:12 +0000 (-0700)
Subject: Merge tag 'ntb-3.17' of git://github.com/jonmason/ntb
X-Git-Tag: v3.17-rc5~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=02c1be3d0c308c8a817bd3cc47fd75c843bf1a46;p=users%2Fwilly%2Fxarray.git

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
---

02c1be3d0c308c8a817bd3cc47fd75c843bf1a46