diff options
| author | David S. Miller <davem@davemloft.net> | 2014-03-18 16:03:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-18 16:03:44 -0400 |
| commit | 0df04c4ccc77da2cf2df93c5c935a97413e5822b (patch) | |
| tree | 8e172890c068aa444029779ea39570e6941a98eb /drivers/net/ethernet/broadcom/cnic.h | |
| parent | ff0992e9036e9810e7cd45234fa32ca1e79750e2 (diff) | |
| parent | c3661283f947ff5023b717240d069e9be765b0a9 (diff) | |
Merge branch 'cnic-net'
Michael Chan says:
====================
cnic bug fixes for net-next
Michael Chan (3):
cnic: Use proper ulp_ops for per device operations.
cnic,bnx2i,bnx2fc: Fix inconsistent use of page size
cnic: Update version to 2.5.20 and copyright year.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/cnic.h')
| -rw-r--r-- | drivers/net/ethernet/broadcom/cnic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/cnic.h b/drivers/net/ethernet/broadcom/cnic.h index 0d6b13f854d..d535ae4228b 100644 --- a/drivers/net/ethernet/broadcom/cnic.h +++ b/drivers/net/ethernet/broadcom/cnic.h @@ -1,6 +1,6 @@ /* cnic.h: Broadcom CNIC core network driver. * - * Copyright (c) 2006-2013 Broadcom Corporation + * Copyright (c) 2006-2014 Broadcom Corporation * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by |