diff options
| author | David S. Miller <davem@davemloft.net> | 2015-06-01 22:14:35 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-01 22:14:35 -0700 |
| commit | db3397b9aa30d334be237170e048dcd96e1e951d (patch) | |
| tree | 119132fcc78cc27155b4954d7bc9a55fee046838 /net/mac80211/key.c | |
| parent | d89511251f6519599b109dc6cda87a6ab314ed8c (diff) | |
| parent | 41fc2e41d348a7bca768815adf033bbf00de220f (diff) | |
Merge branch 'cxgb4-next'
Hariprasad Shenai says:
====================
cxgb4/cxgb4vf: Adds support for Chelsio T6 adapter
This patch series adds the following:
Adds NIC driver support for T6 adapter
Adds vNIC driver support for T6 adapter
This patch series has been created against net-next tree and includes
patches on cxgb4 and cxgb4vf driver.
We have included all the maintainers of respective drivers. Kindly review
the change and let us know in case of any review comments.
Thanks
V2:
Fixed compilation issue, when CHELSIO_T4_FCOE is set
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/key.c')
0 files changed, 0 insertions, 0 deletions