projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fa54cc7
8852ddb
)
Merge branch 'bnxt_en-fixes'
author
David S. Miller
<davem@davemloft.net>
Tue, 7 Jun 2016 23:02:04 +0000
(16:02 -0700)
committer
David S. Miller
<davem@davemloft.net>
Tue, 7 Jun 2016 23:02:04 +0000
(16:02 -0700)
Michael Chan says:
====================
bnxt_en: Bug fixes.
Fix a race condition and VLAN rx acceleration logic.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Trivial merge