projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d110986
028de14
)
Merge branch 'bnxt_en-fixes'
author
David S. Miller
<
[email protected]
>
Sat, 12 Dec 2015 04:34:06 +0000
(23:34 -0500)
committer
David S. Miller
<
[email protected]
>
Sat, 12 Dec 2015 04:34:06 +0000
(23:34 -0500)
Michael Chan says:
====================
bnxt_en: Bug fix and add tx timeout recovery.
Fix a bitmap declaration bug and add missing tx timeout recovery.
v2: Fixed white space error. Thanks Dave.
====================
Signed-off-by: David S. Miller <
[email protected]
>
Trivial merge
projects / openwrt / staging / blogic.git / commitdiff