diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-01-24 02:14:25 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-01-24 02:14:25 -0500 |
commit | e47b207a5bcb73bb097f94d9fe364f50737b0eb2 (patch) | |
tree | 57389653c37d001de3a90655cb4172ba29199ce4 /drivers/net | |
parent | d344bff9c36db17dc4765215495aaa7212c1eb6c (diff) | |
parent | 419dd8378dfa32985672ab7927b4bc827f33b332 (diff) | |
download | kernel_samsung_smdk4412-e47b207a5bcb73bb097f94d9fe364f50737b0eb2.zip kernel_samsung_smdk4412-e47b207a5bcb73bb097f94d9fe364f50737b0eb2.tar.gz kernel_samsung_smdk4412-e47b207a5bcb73bb097f94d9fe364f50737b0eb2.tar.bz2 |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/irda/stir4200.c | 2 | ||||
-rw-r--r-- | drivers/net/skge.c | 2 | ||||
-rw-r--r-- | drivers/net/sky2.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c index c14a746..20d306f 100644 --- a/drivers/net/irda/stir4200.c +++ b/drivers/net/irda/stir4200.c @@ -59,7 +59,7 @@ #include <asm/byteorder.h> #include <asm/unaligned.h> -MODULE_AUTHOR("Stephen Hemminger <shemminger@osdl.org>"); +MODULE_AUTHOR("Stephen Hemminger <shemminger@linux-foundation.org>"); MODULE_DESCRIPTION("IrDA-USB Dongle Driver for SigmaTel STIr4200"); MODULE_LICENSE("GPL"); diff --git a/drivers/net/skge.c b/drivers/net/skge.c index deedfd5..45283f3 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c @@ -60,7 +60,7 @@ #define LINK_HZ (HZ/2) MODULE_DESCRIPTION("SysKonnect Gigabit Ethernet driver"); -MODULE_AUTHOR("Stephen Hemminger <shemminger@osdl.org>"); +MODULE_AUTHOR("Stephen Hemminger <shemminger@linux-foundation.org>"); MODULE_LICENSE("GPL"); MODULE_VERSION(DRV_VERSION); diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index a6601e8..a2e804d 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -3691,6 +3691,6 @@ module_init(sky2_init_module); module_exit(sky2_cleanup_module); MODULE_DESCRIPTION("Marvell Yukon 2 Gigabit Ethernet driver"); -MODULE_AUTHOR("Stephen Hemminger <shemminger@osdl.org>"); +MODULE_AUTHOR("Stephen Hemminger <shemminger@linux-foundation.org>"); MODULE_LICENSE("GPL"); MODULE_VERSION(DRV_VERSION); |