Merge branch 'broadcom_rebranding'
authorDavid S. Miller <davem@davemloft.net>
Wed, 25 Jun 2014 23:28:01 +0000 (16:28 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 25 Jun 2014 23:28:01 +0000 (16:28 -0700)
Jitendra Kalsaria says:

====================
Rebranding changes for bnx2 and cnic driver

The following set of patches are for rebranding Broadcom bnx2 and cnic driver as QLogic drivers.
Please apply this series to net-next.
====================

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

Trivial merge