Merge branch 'bnx2x'
authorDavid S. Miller <davem@davemloft.net>
Mon, 24 Jun 2013 06:54:23 +0000 (23:54 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 24 Jun 2013 06:54:23 +0000 (23:54 -0700)
commitb0b02c77d7aa9ebeea5d4ea7e4f3fd745ad7f81c
treebc05d0f39b0b2b3f35c1c1c3a0b8b1f46ab31d69
parenta49dd9dcb50195b35a5e59eb65b8e56584874630
parentb8e0d884cba6b9cd6e43adfaab9e67096ee8fb28
Merge branch 'bnx2x'

Yuval Mintz says:

====================
This patch series mostly revolves around improving SR-IOV implementation
(Better PF-VF relation, sanity checks and timings), as well as including
a patch correcting the (outward) advertisement of 20G capabilities.
====================

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