diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
| commit | 65b53e4cc90e59936733b3b95b9451d2ca47528d (patch) | |
| tree | 29932718192962671c48c3fd1ea017a6112459e8 /drivers/net/myri10ge | |
| parent | 788c0a53164c05c5ccdb1472474372b72ba74644 (diff) | |
| parent | 2e761e0532a784816e7e822dbaaece8c5d4be14d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tg3.c
drivers/net/wireless/rt2x00/rt2x00dev.c
net/mac80211/ieee80211_i.h
Diffstat (limited to 'drivers/net/myri10ge')
| -rw-r--r-- | drivers/net/myri10ge/myri10ge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index 93007d38df57..9a68d2ea5f3e 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c | |||
| @@ -76,7 +76,7 @@ | |||
| 76 | #include "myri10ge_mcp.h" | 76 | #include "myri10ge_mcp.h" |
| 77 | #include "myri10ge_mcp_gen_header.h" | 77 | #include "myri10ge_mcp_gen_header.h" |
| 78 | 78 | ||
| 79 | #define MYRI10GE_VERSION_STR "1.3.2-1.287" | 79 | #define MYRI10GE_VERSION_STR "1.3.99-1.347" |
| 80 | 80 | ||
| 81 | MODULE_DESCRIPTION("Myricom 10G driver (10GbE)"); | 81 | MODULE_DESCRIPTION("Myricom 10G driver (10GbE)"); |
| 82 | MODULE_AUTHOR("Maintainer: help@myri.com"); | 82 | MODULE_AUTHOR("Maintainer: help@myri.com"); |