]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
projects / mirror_ubuntu-eoan-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d110986 028de14)
Merge branch 'bnxt_en-fixes'
authorDavid S. Miller <davem@davemloft.net>
Sat, 12 Dec 2015 04:34:06 +0000 (23:34 -0500)
committerDavid S. Miller <davem@davemloft.net>
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 <davem@davemloft.net>

Trivial merge
Ubuntu Eoan Linux kernel mirror