commit | 173d26f8d50528005e0daaeb890b695a3b48f1f9 | [log] [tgz] |
---|---|---|
author | David S. Miller <davem@davemloft.net> | Fri Dec 11 23:34:06 2015 -0500 |
committer | David S. Miller <davem@davemloft.net> | Fri Dec 11 23:34:06 2015 -0500 |
tree | 4257c33bddf30380a8c3a8d690629a0668a4ee3e | |
parent | d110986c5ddb1caf576e8576044c0c831e3e7fa4 [diff] | |
parent | 028de140ffdf481d4948de663b33dae78e1e9cc8 [diff] |
Merge branch 'bnxt_en-fixes' 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>