diff options
-rw-r--r-- | MAINTAINERS | 20 | ||||
-rw-r--r-- | arch/sh/boards/board-polaris.c | 2 | ||||
-rw-r--r-- | drivers/hwmon/emc2103.c | 2 | ||||
-rw-r--r-- | drivers/net/phy/smsc.c | 2 | ||||
-rw-r--r-- | drivers/net/usb/smsc75xx.c | 2 | ||||
-rw-r--r-- | drivers/net/usb/smsc95xx.c | 2 | ||||
-rw-r--r-- | drivers/video/smscufx.c | 4 |
7 files changed, 17 insertions, 17 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cc710d2ef009..bb42625204ee 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -6202,9 +6202,9 @@ F: Documentation/hwmon/smm665 | |||
6202 | F: drivers/hwmon/smm665.c | 6202 | F: drivers/hwmon/smm665.c |
6203 | 6203 | ||
6204 | SMSC EMC2103 HARDWARE MONITOR DRIVER | 6204 | SMSC EMC2103 HARDWARE MONITOR DRIVER |
6205 | M: Steve Glendinning <steve.glendinning@smsc.com> | 6205 | M: Steve Glendinning <steve.glendinning@shawell.net> |
6206 | L: lm-sensors@lm-sensors.org | 6206 | L: lm-sensors@lm-sensors.org |
6207 | S: Supported | 6207 | S: Maintained |
6208 | F: Documentation/hwmon/emc2103 | 6208 | F: Documentation/hwmon/emc2103 |
6209 | F: drivers/hwmon/emc2103.c | 6209 | F: drivers/hwmon/emc2103.c |
6210 | 6210 | ||
@@ -6223,22 +6223,22 @@ F: Documentation/hwmon/smsc47b397 | |||
6223 | F: drivers/hwmon/smsc47b397.c | 6223 | F: drivers/hwmon/smsc47b397.c |
6224 | 6224 | ||
6225 | SMSC911x ETHERNET DRIVER | 6225 | SMSC911x ETHERNET DRIVER |
6226 | M: Steve Glendinning <steve.glendinning@smsc.com> | 6226 | M: Steve Glendinning <steve.glendinning@shawell.net> |
6227 | L: netdev@vger.kernel.org | 6227 | L: netdev@vger.kernel.org |
6228 | S: Supported | 6228 | S: Maintained |
6229 | F: include/linux/smsc911x.h | 6229 | F: include/linux/smsc911x.h |
6230 | F: drivers/net/ethernet/smsc/smsc911x.* | 6230 | F: drivers/net/ethernet/smsc/smsc911x.* |
6231 | 6231 | ||
6232 | SMSC9420 PCI ETHERNET DRIVER | 6232 | SMSC9420 PCI ETHERNET DRIVER |
6233 | M: Steve Glendinning <steve.glendinning@smsc.com> | 6233 | M: Steve Glendinning <steve.glendinning@shawell.net> |
6234 | L: netdev@vger.kernel.org | 6234 | L: netdev@vger.kernel.org |
6235 | S: Supported | 6235 | S: Maintained |
6236 | F: drivers/net/ethernet/smsc/smsc9420.* | 6236 | F: drivers/net/ethernet/smsc/smsc9420.* |
6237 | 6237 | ||
6238 | SMSC UFX6000 and UFX7000 USB to VGA DRIVER | 6238 | SMSC UFX6000 and UFX7000 USB to VGA DRIVER |
6239 | M: Steve Glendinning <steve.glendinning@smsc.com> | 6239 | M: Steve Glendinning <steve.glendinning@shawell.net> |
6240 | L: linux-fbdev@vger.kernel.org | 6240 | L: linux-fbdev@vger.kernel.org |
6241 | S: Supported | 6241 | S: Maintained |
6242 | F: drivers/video/smscufx.c | 6242 | F: drivers/video/smscufx.c |
6243 | 6243 | ||
6244 | SN-IA64 (Itanium) SUB-PLATFORM | 6244 | SN-IA64 (Itanium) SUB-PLATFORM |
@@ -7184,9 +7184,9 @@ S: Supported | |||
7184 | F: drivers/usb/serial/whiteheat* | 7184 | F: drivers/usb/serial/whiteheat* |
7185 | 7185 | ||
7186 | USB SMSC95XX ETHERNET DRIVER | 7186 | USB SMSC95XX ETHERNET DRIVER |
7187 | M: Steve Glendinning <steve.glendinning@smsc.com> | 7187 | M: Steve Glendinning <steve.glendinning@shawell.net> |
7188 | L: netdev@vger.kernel.org | 7188 | L: netdev@vger.kernel.org |
7189 | S: Supported | 7189 | S: Maintained |
7190 | F: drivers/net/usb/smsc95xx.* | 7190 | F: drivers/net/usb/smsc95xx.* |
7191 | 7191 | ||
7192 | USB SN9C1xx DRIVER | 7192 | USB SN9C1xx DRIVER |
diff --git a/arch/sh/boards/board-polaris.c b/arch/sh/boards/board-polaris.c index 37d03c097ae9..0978ae2e4847 100644 --- a/arch/sh/boards/board-polaris.c +++ b/arch/sh/boards/board-polaris.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * June 2006 steve.glendinning@smsc.com | 2 | * June 2006 Steve Glendinning <steve.glendinning@shawell.net> |
3 | * | 3 | * |
4 | * Polaris-specific resource declaration | 4 | * Polaris-specific resource declaration |
5 | * | 5 | * |
diff --git a/drivers/hwmon/emc2103.c b/drivers/hwmon/emc2103.c index 9691f664c76e..a73e68519cbf 100644 --- a/drivers/hwmon/emc2103.c +++ b/drivers/hwmon/emc2103.c | |||
@@ -728,6 +728,6 @@ static struct i2c_driver emc2103_driver = { | |||
728 | 728 | ||
729 | module_i2c_driver(emc2103_driver); | 729 | module_i2c_driver(emc2103_driver); |
730 | 730 | ||
731 | MODULE_AUTHOR("Steve Glendinning <steve.glendinning@smsc.com>"); | 731 | MODULE_AUTHOR("Steve Glendinning <steve.glendinning@shawell.net>"); |
732 | MODULE_DESCRIPTION("SMSC EMC2103 hwmon driver"); | 732 | MODULE_DESCRIPTION("SMSC EMC2103 hwmon driver"); |
733 | MODULE_LICENSE("GPL"); | 733 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c index fc3e7e96c88c..42c43e75d3e7 100644 --- a/drivers/net/phy/smsc.c +++ b/drivers/net/phy/smsc.c | |||
@@ -12,7 +12,7 @@ | |||
12 | * Free Software Foundation; either version 2 of the License, or (at your | 12 | * Free Software Foundation; either version 2 of the License, or (at your |
13 | * option) any later version. | 13 | * option) any later version. |
14 | * | 14 | * |
15 | * Support added for SMSC LAN8187 and LAN8700 by steve.glendinning@smsc.com | 15 | * Support added for SMSC LAN8187 and LAN8700 by steve.glendinning@shawell.net |
16 | * | 16 | * |
17 | */ | 17 | */ |
18 | 18 | ||
diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c index 1c6e51588da7..75bbfdb180bf 100644 --- a/drivers/net/usb/smsc75xx.c +++ b/drivers/net/usb/smsc75xx.c | |||
@@ -1260,6 +1260,6 @@ static struct usb_driver smsc75xx_driver = { | |||
1260 | module_usb_driver(smsc75xx_driver); | 1260 | module_usb_driver(smsc75xx_driver); |
1261 | 1261 | ||
1262 | MODULE_AUTHOR("Nancy Lin"); | 1262 | MODULE_AUTHOR("Nancy Lin"); |
1263 | MODULE_AUTHOR("Steve Glendinning <steve.glendinning@smsc.com>"); | 1263 | MODULE_AUTHOR("Steve Glendinning <steve.glendinning@shawell.net>"); |
1264 | MODULE_DESCRIPTION("SMSC75XX USB 2.0 Gigabit Ethernet Devices"); | 1264 | MODULE_DESCRIPTION("SMSC75XX USB 2.0 Gigabit Ethernet Devices"); |
1265 | MODULE_LICENSE("GPL"); | 1265 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index b1112e753859..24c8f372b75e 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c | |||
@@ -1303,6 +1303,6 @@ static struct usb_driver smsc95xx_driver = { | |||
1303 | module_usb_driver(smsc95xx_driver); | 1303 | module_usb_driver(smsc95xx_driver); |
1304 | 1304 | ||
1305 | MODULE_AUTHOR("Nancy Lin"); | 1305 | MODULE_AUTHOR("Nancy Lin"); |
1306 | MODULE_AUTHOR("Steve Glendinning <steve.glendinning@smsc.com>"); | 1306 | MODULE_AUTHOR("Steve Glendinning <steve.glendinning@shawell.net>"); |
1307 | MODULE_DESCRIPTION("SMSC95XX USB 2.0 Ethernet Devices"); | 1307 | MODULE_DESCRIPTION("SMSC95XX USB 2.0 Ethernet Devices"); |
1308 | MODULE_LICENSE("GPL"); | 1308 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/video/smscufx.c b/drivers/video/smscufx.c index ccbfef5e828f..2e4c2492173a 100644 --- a/drivers/video/smscufx.c +++ b/drivers/video/smscufx.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * smscufx.c -- Framebuffer driver for SMSC UFX USB controller | 2 | * smscufx.c -- Framebuffer driver for SMSC UFX USB controller |
3 | * | 3 | * |
4 | * Copyright (C) 2011 Steve Glendinning <steve.glendinning@smsc.com> | 4 | * Copyright (C) 2011 Steve Glendinning <steve.glendinning@shawell.net> |
5 | * Copyright (C) 2009 Roberto De Ioris <roberto@unbit.it> | 5 | * Copyright (C) 2009 Roberto De Ioris <roberto@unbit.it> |
6 | * Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com> | 6 | * Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com> |
7 | * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com> | 7 | * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com> |
@@ -1972,6 +1972,6 @@ MODULE_PARM_DESC(console, "Allow fbcon to be used on this display"); | |||
1972 | module_param(fb_defio, bool, S_IWUSR | S_IRUSR | S_IWGRP | S_IRGRP); | 1972 | module_param(fb_defio, bool, S_IWUSR | S_IRUSR | S_IWGRP | S_IRGRP); |
1973 | MODULE_PARM_DESC(fb_defio, "Enable fb_defio mmap support"); | 1973 | MODULE_PARM_DESC(fb_defio, "Enable fb_defio mmap support"); |
1974 | 1974 | ||
1975 | MODULE_AUTHOR("Steve Glendinning <steve.glendinning@smsc.com>"); | 1975 | MODULE_AUTHOR("Steve Glendinning <steve.glendinning@shawell.net>"); |
1976 | MODULE_DESCRIPTION("SMSC UFX kernel framebuffer driver"); | 1976 | MODULE_DESCRIPTION("SMSC UFX kernel framebuffer driver"); |
1977 | MODULE_LICENSE("GPL"); | 1977 | MODULE_LICENSE("GPL"); |