]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cbb2dec c8160af)
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)
commitfc67f0c4eacfdc3548083442918fc80d66c153b9
tree4257c33bddf30380a8c3a8d690629a0668a4ee3etree | snapshot
parentcbb2decaae3fcaa317d3976dea6cb461e282b960commit | diff
parentc8160afd2b63dee10c30d933048d5842a23ffc20commit | 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>
Linux Kernel Source Tree.