From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 14 Nov 2016 16:14:49 +0000 (-0800)
Subject: Merge tag 'ntb-4.9' of git://github.com/jonmason/ntb
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=28ddafa5905310889defc485dbefe0a484edb2b6;p=openwrt%2Fstaging%2Fblogic.git

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

Pull NTB fixes from Jon Mason:
 "NTB bug fixes for ntb_hw_intel, ntb_perf, and ntb_pingpong.

  Also, a fixup to use jiffies in schedule_timeout_* call instead of a
  constant"

* tag 'ntb-4.9' of git://github.com/jonmason/ntb:
  ntb_perf: potential info leak in debugfs
  ntb: ntb_hw_intel: init peer_addr in struct intel_ntb_dev
  ntb: make DMA_OUT_RESOURCE_TO HZ independent
  ntb_transport: make DMA_OUT_RESOURCE_TO HZ independent
  NTB: ntb_hw_intel: Fix typo in module parameter descriptions
  ntb_pingpong: Fix db_init parameter description
---

28ddafa5905310889defc485dbefe0a484edb2b6