aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS20
-rw-r--r--arch/sh/boards/board-polaris.c2
-rw-r--r--drivers/hwmon/emc2103.c2
-rw-r--r--drivers/net/phy/smsc.c2
-rw-r--r--drivers/net/usb/smsc75xx.c2
-rw-r--r--drivers/net/usb/smsc95xx.c2
-rw-r--r--drivers/video/smscufx.c4
7 files changed, 17 insertions, 17 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index cc710d2ef00..bb42625204e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6202,9 +6202,9 @@ F: Documentation/hwmon/smm665
6202F: drivers/hwmon/smm665.c 6202F: drivers/hwmon/smm665.c
6203 6203
6204SMSC EMC2103 HARDWARE MONITOR DRIVER 6204SMSC EMC2103 HARDWARE MONITOR DRIVER
6205M: Steve Glendinning <steve.glendinning@smsc.com> 6205M: Steve Glendinning <steve.glendinning@shawell.net>
6206L: lm-sensors@lm-sensors.org 6206L: lm-sensors@lm-sensors.org
6207S: Supported 6207S: Maintained
6208F: Documentation/hwmon/emc2103 6208F: Documentation/hwmon/emc2103
6209F: drivers/hwmon/emc2103.c 6209F: drivers/hwmon/emc2103.c
6210 6210
@@ -6223,22 +6223,22 @@ F: Documentation/hwmon/smsc47b397
6223F: drivers/hwmon/smsc47b397.c 6223F: drivers/hwmon/smsc47b397.c
6224 6224
6225SMSC911x ETHERNET DRIVER 6225SMSC911x ETHERNET DRIVER
6226M: Steve Glendinning <steve.glendinning@smsc.com> 6226M: Steve Glendinning <steve.glendinning@shawell.net>
6227L: netdev@vger.kernel.org 6227L: netdev@vger.kernel.org
6228S: Supported 6228S: Maintained
6229F: include/linux/smsc911x.h 6229F: include/linux/smsc911x.h
6230F: drivers/net/ethernet/smsc/smsc911x.* 6230F: drivers/net/ethernet/smsc/smsc911x.*
6231 6231
6232SMSC9420 PCI ETHERNET DRIVER 6232SMSC9420 PCI ETHERNET DRIVER
6233M: Steve Glendinning <steve.glendinning@smsc.com> 6233M: Steve Glendinning <steve.glendinning@shawell.net>
6234L: netdev@vger.kernel.org 6234L: netdev@vger.kernel.org
6235S: Supported 6235S: Maintained
6236F: drivers/net/ethernet/smsc/smsc9420.* 6236F: drivers/net/ethernet/smsc/smsc9420.*
6237 6237
6238SMSC UFX6000 and UFX7000 USB to VGA DRIVER 6238SMSC UFX6000 and UFX7000 USB to VGA DRIVER
6239M: Steve Glendinning <steve.glendinning@smsc.com> 6239M: Steve Glendinning <steve.glendinning@shawell.net>
6240L: linux-fbdev@vger.kernel.org 6240L: linux-fbdev@vger.kernel.org
6241S: Supported 6241S: Maintained
6242F: drivers/video/smscufx.c 6242F: drivers/video/smscufx.c
6243 6243
6244SN-IA64 (Itanium) SUB-PLATFORM 6244SN-IA64 (Itanium) SUB-PLATFORM
@@ -7184,9 +7184,9 @@ S: Supported
7184F: drivers/usb/serial/whiteheat* 7184F: drivers/usb/serial/whiteheat*
7185 7185
7186USB SMSC95XX ETHERNET DRIVER 7186USB SMSC95XX ETHERNET DRIVER
7187M: Steve Glendinning <steve.glendinning@smsc.com> 7187M: Steve Glendinning <steve.glendinning@shawell.net>
7188L: netdev@vger.kernel.org 7188L: netdev@vger.kernel.org
7189S: Supported 7189S: Maintained
7190F: drivers/net/usb/smsc95xx.* 7190F: drivers/net/usb/smsc95xx.*
7191 7191
7192USB SN9C1xx DRIVER 7192USB SN9C1xx DRIVER
diff --git a/arch/sh/boards/board-polaris.c b/arch/sh/boards/board-polaris.c
index 37d03c097ae..0978ae2e484 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 9691f664c76..a73e68519cb 100644
--- a/drivers/hwmon/emc2103.c
+++ b/drivers/hwmon/emc2103.c
@@ -728,6 +728,6 @@ static struct i2c_driver emc2103_driver = {
728 728
729module_i2c_driver(emc2103_driver); 729module_i2c_driver(emc2103_driver);
730 730
731MODULE_AUTHOR("Steve Glendinning <steve.glendinning@smsc.com>"); 731MODULE_AUTHOR("Steve Glendinning <steve.glendinning@shawell.net>");
732MODULE_DESCRIPTION("SMSC EMC2103 hwmon driver"); 732MODULE_DESCRIPTION("SMSC EMC2103 hwmon driver");
733MODULE_LICENSE("GPL"); 733MODULE_LICENSE("GPL");
diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c
index fc3e7e96c88..42c43e75d3e 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 1c6e51588da..75bbfdb180b 100644
--- a/drivers/net/usb/smsc75xx.c
+++ b/drivers/net/usb/smsc75xx.c
@@ -1260,6 +1260,6 @@ static struct usb_driver smsc75xx_driver = {
1260module_usb_driver(smsc75xx_driver); 1260module_usb_driver(smsc75xx_driver);
1261 1261
1262MODULE_AUTHOR("Nancy Lin"); 1262MODULE_AUTHOR("Nancy Lin");
1263MODULE_AUTHOR("Steve Glendinning <steve.glendinning@smsc.com>"); 1263MODULE_AUTHOR("Steve Glendinning <steve.glendinning@shawell.net>");
1264MODULE_DESCRIPTION("SMSC75XX USB 2.0 Gigabit Ethernet Devices"); 1264MODULE_DESCRIPTION("SMSC75XX USB 2.0 Gigabit Ethernet Devices");
1265MODULE_LICENSE("GPL"); 1265MODULE_LICENSE("GPL");
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index b1112e75385..24c8f372b75 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -1303,6 +1303,6 @@ static struct usb_driver smsc95xx_driver = {
1303module_usb_driver(smsc95xx_driver); 1303module_usb_driver(smsc95xx_driver);
1304 1304
1305MODULE_AUTHOR("Nancy Lin"); 1305MODULE_AUTHOR("Nancy Lin");
1306MODULE_AUTHOR("Steve Glendinning <steve.glendinning@smsc.com>"); 1306MODULE_AUTHOR("Steve Glendinning <steve.glendinning@shawell.net>");
1307MODULE_DESCRIPTION("SMSC95XX USB 2.0 Ethernet Devices"); 1307MODULE_DESCRIPTION("SMSC95XX USB 2.0 Ethernet Devices");
1308MODULE_LICENSE("GPL"); 1308MODULE_LICENSE("GPL");
diff --git a/drivers/video/smscufx.c b/drivers/video/smscufx.c
index ccbfef5e828..2e4c2492173 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");
1972module_param(fb_defio, bool, S_IWUSR | S_IRUSR | S_IWGRP | S_IRGRP); 1972module_param(fb_defio, bool, S_IWUSR | S_IRUSR | S_IWGRP | S_IRGRP);
1973MODULE_PARM_DESC(fb_defio, "Enable fb_defio mmap support"); 1973MODULE_PARM_DESC(fb_defio, "Enable fb_defio mmap support");
1974 1974
1975MODULE_AUTHOR("Steve Glendinning <steve.glendinning@smsc.com>"); 1975MODULE_AUTHOR("Steve Glendinning <steve.glendinning@shawell.net>");
1976MODULE_DESCRIPTION("SMSC UFX kernel framebuffer driver"); 1976MODULE_DESCRIPTION("SMSC UFX kernel framebuffer driver");
1977MODULE_LICENSE("GPL"); 1977MODULE_LICENSE("GPL");