From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 12 Apr 2014 23:16:39 +0000 (-0700)
Subject: Merge tag 'ntb-3.15' of git://github.com/jonmason/ntb
X-Git-Tag: v3.15-rc1~14
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=07f5fef981bd89e92d67a69370c6487679cf66e4;p=linux-2.6-block.git

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

Pull PCIe non-transparent bridge fixes and features from Jon Mason:
 "NTB driver bug fixes to address issues in list traversal, skb leak in
  ntb_netdev, a typo, and a leak of msix entries in the error path.
  Clean ups of the event handling logic, as well as a overall style
  cleanup.  Finally, the driver was converted to use the new
  pci_enable_msix_range logic (and the refactoring to go along with it)"

* tag 'ntb-3.15' of git://github.com/jonmason/ntb:
  ntb: Use pci_enable_msix_range() instead of pci_enable_msix()
  ntb: Split ntb_setup_msix() into separate BWD/SNB routines
  ntb: Use pci_msix_vec_count() to obtain number of MSI-Xs
  NTB: Code Style Clean-up
  NTB: client event cleanup
  ntb: Fix leakage of ntb_device::msix_entries[] array
  NTB: Fix typo in setting one translation register
  ntb_netdev: Fix skb free issue in open
  ntb_netdev: Fix list_for_each_entry exit issue
---

07f5fef981bd89e92d67a69370c6487679cf66e4