From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 12 Sep 2015 02:29:00 +0000 (-0700)
Subject: Merge tag 'ntb-4.3' of git://github.com/jonmason/ntb
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~7475
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ded0e250b58a27af6034a8ab9226cbcdf7c0d847;p=mirror_ubuntu-artful-kernel.git

Merge tag 'ntb-4.3' of git://github.com/jonmason/ntb

Pull NTB fixes from Jon Mason:
 "NTB bug and documentation fixes, new device IDs, performance
  improvements, and adding a mailing list to MAINTAINERS for NTB"

* tag 'ntb-4.3' of git://github.com/jonmason/ntb:
  NTB: Fix range check on memory window index
  NTB: Improve index handling in B2B MW workaround
  NTB: Fix documentation for ntb_peer_db_clear.
  NTB: Fix documentation for ntb_link_is_up
  NTB: Use unique DMA channels for TX and RX
  NTB: Remove dma_sync_wait from ntb_async_rx
  NTB: Clean up QP stats info
  NTB: Make the transport list in order of discovery
  NTB: Add PCI Device IDs for Broadwell Xeon
  NTB: Add flow control to the ntb_netdev
  NTB: Add list to MAINTAINERS
---

ded0e250b58a27af6034a8ab9226cbcdf7c0d847