From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 19 Oct 2014 19:58:22 +0000 (-0700)
Subject: Merge tag 'ntb-3.18' of git://github.com/jonmason/ntb
X-Git-Tag: v4.9.8~5479
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61ed53deb1c6a4386d8710dbbfcee8779c381931;p=platform%2Fkernel%2Flinux-rpi3.git

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

Pull ntb (non-transparent bridge) updates from Jon Mason:
 "Add support for Haswell NTB split BARs, a debugfs entry for basic
  debugging info, and some code clean-ups"

* tag 'ntb-3.18' of git://github.com/jonmason/ntb:
  ntb: Adding split BAR support for Haswell platforms
  ntb: use errata flag set via DID to implement workaround
  ntb: conslidate reading of PPD to move platform detection earlier
  ntb: move platform detection to separate function
  NTB: debugfs device entry
---

61ed53deb1c6a4386d8710dbbfcee8779c381931