projects / sdk / emulator / emulator-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit173d26f8d50528005e0daaeb890b695a3b48f1f9
tree4257c33bddf30380a8c3a8d690629a0668a4ee3etree | snapshot
parentd110986c5ddb1caf576e8576044c0c831e3e7fa4commit | diff
parent028de140ffdf481d4948de663b33dae78e1e9cc8commit | 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>
Domain: SDK / Emulator;