Merge branch 'bnx2x'
authorDavid S. Miller <davem@davemloft.net>
Mon, 6 Jan 2014 01:23:12 +0000 (20:23 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 6 Jan 2014 01:23:12 +0000 (20:23 -0500)
commit723a6c7a297b509d6d779aba3be3a0fb8c374d99
treeaca413a0f47936317aa1dffd0bf054e429546398
parenta02bdd423d844f5beb3196922f07c85c2f7691b8
parente8379c79542c95b25890ed49be652b1634deca17
Merge branch 'bnx2x'

Yuval Mintz says:

====================
bnx2x: Bug fixes patch series

Most of what this parch series contains is SR-IOV related bug fixes.
Additionally, it contains some small fixes for legacy devices/modes.

Please consider applying these patches to `net'.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>