projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1f1e34f
ebaad13
)
Merge tag 'ntb-4.1' of git://github.com/jonmason/ntb
author
Linus Torvalds
<torvalds@linux-foundation.org>
Mon, 15 Jun 2015 01:46:43 +0000
(15:46 -1000)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Mon, 15 Jun 2015 01:46:43 +0000
(15:46 -1000)
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
Trivial merge