From d803f00bc3e84fcedb8581b8ce9ea6ebebfd91a9 Mon Sep 17 00:00:00 2001 From: Steve Glendinning Date: Mon, 16 Apr 2012 12:13:29 +0100 Subject: [PATCH] --- yaml --- r: 316103 b: refs/heads/master c: 90b24cfb42fc5c0366a0555fd5236e9f84f86d2c h: refs/heads/master i: 316101: b9e9f9be5449f28439d01c4a37d24992e291d540 316099: d5d95e8852c9bdd5c0b59f4b64e730317a7af7ea 316095: 8e67cba1ca9c83ba04363912ae27c47ac0fe0ab8 v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 20 ++++++++++---------- trunk/arch/sh/boards/board-polaris.c | 2 +- trunk/drivers/hwmon/emc2103.c | 2 +- trunk/drivers/net/phy/smsc.c | 2 +- trunk/drivers/net/usb/smsc75xx.c | 2 +- trunk/drivers/net/usb/smsc95xx.c | 2 +- trunk/drivers/video/smscufx.c | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index da8ddc6f06ec..81d8202a589a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 10983f2e8dc65d118371681548809109b570b63b +refs/heads/master: 90b24cfb42fc5c0366a0555fd5236e9f84f86d2c diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index cc710d2ef009..bb42625204ee 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -6202,9 +6202,9 @@ F: Documentation/hwmon/smm665 F: drivers/hwmon/smm665.c SMSC EMC2103 HARDWARE MONITOR DRIVER -M: Steve Glendinning +M: Steve Glendinning L: lm-sensors@lm-sensors.org -S: Supported +S: Maintained F: Documentation/hwmon/emc2103 F: drivers/hwmon/emc2103.c @@ -6223,22 +6223,22 @@ F: Documentation/hwmon/smsc47b397 F: drivers/hwmon/smsc47b397.c SMSC911x ETHERNET DRIVER -M: Steve Glendinning +M: Steve Glendinning L: netdev@vger.kernel.org -S: Supported +S: Maintained F: include/linux/smsc911x.h F: drivers/net/ethernet/smsc/smsc911x.* SMSC9420 PCI ETHERNET DRIVER -M: Steve Glendinning +M: Steve Glendinning L: netdev@vger.kernel.org -S: Supported +S: Maintained F: drivers/net/ethernet/smsc/smsc9420.* SMSC UFX6000 and UFX7000 USB to VGA DRIVER -M: Steve Glendinning +M: Steve Glendinning L: linux-fbdev@vger.kernel.org -S: Supported +S: Maintained F: drivers/video/smscufx.c SN-IA64 (Itanium) SUB-PLATFORM @@ -7184,9 +7184,9 @@ S: Supported F: drivers/usb/serial/whiteheat* USB SMSC95XX ETHERNET DRIVER -M: Steve Glendinning +M: Steve Glendinning L: netdev@vger.kernel.org -S: Supported +S: Maintained F: drivers/net/usb/smsc95xx.* USB SN9C1xx DRIVER diff --git a/trunk/arch/sh/boards/board-polaris.c b/trunk/arch/sh/boards/board-polaris.c index 37d03c097ae9..0978ae2e4847 100644 --- a/trunk/arch/sh/boards/board-polaris.c +++ b/trunk/arch/sh/boards/board-polaris.c @@ -1,5 +1,5 @@ /* - * June 2006 steve.glendinning@smsc.com + * June 2006 Steve Glendinning * * Polaris-specific resource declaration * diff --git a/trunk/drivers/hwmon/emc2103.c b/trunk/drivers/hwmon/emc2103.c index 9691f664c76e..a73e68519cbf 100644 --- a/trunk/drivers/hwmon/emc2103.c +++ b/trunk/drivers/hwmon/emc2103.c @@ -728,6 +728,6 @@ static struct i2c_driver emc2103_driver = { module_i2c_driver(emc2103_driver); -MODULE_AUTHOR("Steve Glendinning "); +MODULE_AUTHOR("Steve Glendinning "); MODULE_DESCRIPTION("SMSC EMC2103 hwmon driver"); MODULE_LICENSE("GPL"); diff --git a/trunk/drivers/net/phy/smsc.c b/trunk/drivers/net/phy/smsc.c index fc3e7e96c88c..42c43e75d3e7 100644 --- a/trunk/drivers/net/phy/smsc.c +++ b/trunk/drivers/net/phy/smsc.c @@ -12,7 +12,7 @@ * Free Software Foundation; either version 2 of the License, or (at your * option) any later version. * - * Support added for SMSC LAN8187 and LAN8700 by steve.glendinning@smsc.com + * Support added for SMSC LAN8187 and LAN8700 by steve.glendinning@shawell.net * */ diff --git a/trunk/drivers/net/usb/smsc75xx.c b/trunk/drivers/net/usb/smsc75xx.c index 1c6e51588da7..75bbfdb180bf 100644 --- a/trunk/drivers/net/usb/smsc75xx.c +++ b/trunk/drivers/net/usb/smsc75xx.c @@ -1260,6 +1260,6 @@ static struct usb_driver smsc75xx_driver = { module_usb_driver(smsc75xx_driver); MODULE_AUTHOR("Nancy Lin"); -MODULE_AUTHOR("Steve Glendinning "); +MODULE_AUTHOR("Steve Glendinning "); MODULE_DESCRIPTION("SMSC75XX USB 2.0 Gigabit Ethernet Devices"); MODULE_LICENSE("GPL"); diff --git a/trunk/drivers/net/usb/smsc95xx.c b/trunk/drivers/net/usb/smsc95xx.c index b1112e753859..24c8f372b75e 100644 --- a/trunk/drivers/net/usb/smsc95xx.c +++ b/trunk/drivers/net/usb/smsc95xx.c @@ -1303,6 +1303,6 @@ static struct usb_driver smsc95xx_driver = { module_usb_driver(smsc95xx_driver); MODULE_AUTHOR("Nancy Lin"); -MODULE_AUTHOR("Steve Glendinning "); +MODULE_AUTHOR("Steve Glendinning "); MODULE_DESCRIPTION("SMSC95XX USB 2.0 Ethernet Devices"); MODULE_LICENSE("GPL"); diff --git a/trunk/drivers/video/smscufx.c b/trunk/drivers/video/smscufx.c index ccbfef5e828f..2e4c2492173a 100644 --- a/trunk/drivers/video/smscufx.c +++ b/trunk/drivers/video/smscufx.c @@ -1,7 +1,7 @@ /* * smscufx.c -- Framebuffer driver for SMSC UFX USB controller * - * Copyright (C) 2011 Steve Glendinning + * Copyright (C) 2011 Steve Glendinning * Copyright (C) 2009 Roberto De Ioris * Copyright (C) 2009 Jaya Kumar * Copyright (C) 2009 Bernie Thompson @@ -1972,6 +1972,6 @@ MODULE_PARM_DESC(console, "Allow fbcon to be used on this display"); module_param(fb_defio, bool, S_IWUSR | S_IRUSR | S_IWGRP | S_IRGRP); MODULE_PARM_DESC(fb_defio, "Enable fb_defio mmap support"); -MODULE_AUTHOR("Steve Glendinning "); +MODULE_AUTHOR("Steve Glendinning "); MODULE_DESCRIPTION("SMSC UFX kernel framebuffer driver"); MODULE_LICENSE("GPL");