OSDN Git Service

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)
commit13ec7a6b9dad16e8d5ed4e92eb1869670db7a93f
tree0de0ae7212061754db438a57aa6bd2a7c823cc23
parent1f74714f1e34a84fe4ef2a6d9b76c20794fb5dcf
parentf1d1baebd1f81904cd12d2bd578353853daa56b9
Merge branch 'broadcom_rebranding'

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>