From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Nov 2013 19:15:12 +0000 (-0800)
Subject: Merge tag 'ntb-3.13' of git://github.com/jonmason/ntb
X-Git-Tag: accepted/tizen/common/20141203.182822~1027
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b95485143b271df65ce7c6ba75daee324ee6f517;p=platform%2Fkernel%2Flinux-arm64.git

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

Pull non-transparent bridge updates from Jon Mason:
 "NTB driver bug fixes to address a missed call to pci_enable_msix,
  NTB-RP Link Up issue, Xeon Doorbell errata workaround, ntb_transport
  link down race, and correct dmaengine_get/put usage.

  Also, clean-ups to remove duplicate defines and document a hardware
  errata.  Finally, some changes to improve performance"

* tag 'ntb-3.13' of git://github.com/jonmason/ntb:
  NTB: Disable interrupts and poll under high load
  NTB: Enable Snoop on Primary Side
  NTB: Document HW errata
  NTB: remove duplicate defines
  NTB: correct dmaengine_get/put usage
  NTB: Fix ntb_transport link down race
  ntb: Fix missed call to pci_enable_msix()
  NTB: Fix NTB-RP Link Up
  NTB: Xeon Doorbell errata workaround
---

b95485143b271df65ce7c6ba75daee324ee6f517