diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-02-07 08:44:11 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-02-07 08:44:26 +0100 |
commit | c7f9a6f377fa64e5a74f8c128d4349765c28fab1 (patch) | |
tree | e71eaf08c5f9179d6fd6c7e08d8539358dc76ad1 /drivers/net/bnx2x/bnx2x.h | |
parent | fe4b04fa31a6dcf4358aa84cf81e5a7fd079469b (diff) | |
parent | 8dbdea8444d303a772bceb1ba963f0e3273bfc5e (diff) |
Merge branch 'linus' into perf/core
Merge reason: Pick up perf fixes that are now upstream
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/bnx2x/bnx2x.h')
-rw-r--r-- | drivers/net/bnx2x/bnx2x.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h index 8e4183717d9..653c62475cb 100644 --- a/drivers/net/bnx2x/bnx2x.h +++ b/drivers/net/bnx2x/bnx2x.h @@ -22,8 +22,8 @@ * (you will need to reboot afterwards) */ /* #define BNX2X_STOP_ON_ERROR */ -#define DRV_MODULE_VERSION "1.62.00-4" -#define DRV_MODULE_RELDATE "2011/01/18" +#define DRV_MODULE_VERSION "1.62.00-5" +#define DRV_MODULE_RELDATE "2011/01/30" #define BNX2X_BC_VER 0x040200 #define BNX2X_MULTI_QUEUE |