From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 15 Jun 2015 01:46:43 +0000 (-1000)
Subject: Merge tag 'ntb-4.1' of git://github.com/jonmason/ntb
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=dc75117fa28af52220cf31ea18493684cf0ffc35;p=openwrt%2Fstaging%2Fblogic.git

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

Pull NTB fixes from Jon Mason:
 "I apologize for the tardiness of this request.  Here are a couple of
  last minute NTB bug fixes for v4.1:

  NTB bug fixes to address issues in unmapping the MW reg base and
  vbase, and an uninitialized variable on Atom platforms"

* tag 'ntb-4.1' of git://github.com/jonmason/ntb:
  ntb: initialize max_mw for Atom before using it
  ntb: iounmap MW reg and vbase in error path
---

dc75117fa28af52220cf31ea18493684cf0ffc35