From: Adrian Bunk The patch below (applies against both 2.4 and 2.6) removes the bouncing email address from all files and removes the outdated MAINTAINERS entry. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton --- 25-akpm/MAINTAINERS | 5 ----- 25-akpm/drivers/char/istallion.c | 2 +- 25-akpm/drivers/char/stallion.c | 2 +- 25-akpm/include/linux/cd1400.h | 2 +- 25-akpm/include/linux/cdk.h | 2 +- 25-akpm/include/linux/comstats.h | 2 +- 25-akpm/include/linux/istallion.h | 2 +- 25-akpm/include/linux/sc26198.h | 2 +- 25-akpm/include/linux/stallion.h | 2 +- 9 files changed, 8 insertions(+), 13 deletions(-) diff -puN drivers/char/istallion.c~remove-outdated-stallion-contact-information drivers/char/istallion.c --- 25/drivers/char/istallion.c~remove-outdated-stallion-contact-information 2004-07-12 18:14:46.380128392 -0700 +++ 25-akpm/drivers/char/istallion.c 2004-07-12 18:14:46.400125352 -0700 @@ -3,7 +3,7 @@ /* * istallion.c -- stallion intelligent multiport serial driver. * - * Copyright (C) 1996-1999 Stallion Technologies (support@stallion.oz.au). + * Copyright (C) 1996-1999 Stallion Technologies * Copyright (C) 1994-1996 Greg Ungerer. * * This code is loosely based on the Linux serial driver, written by diff -puN drivers/char/stallion.c~remove-outdated-stallion-contact-information drivers/char/stallion.c --- 25/drivers/char/stallion.c~remove-outdated-stallion-contact-information 2004-07-12 18:14:46.382128088 -0700 +++ 25-akpm/drivers/char/stallion.c 2004-07-12 18:14:46.404124744 -0700 @@ -3,7 +3,7 @@ /* * stallion.c -- stallion multiport serial driver. * - * Copyright (C) 1996-1999 Stallion Technologies (support@stallion.oz.au). + * Copyright (C) 1996-1999 Stallion Technologies * Copyright (C) 1994-1996 Greg Ungerer. * * This code is loosely based on the Linux serial driver, written by diff -puN include/linux/cd1400.h~remove-outdated-stallion-contact-information include/linux/cd1400.h --- 25/include/linux/cd1400.h~remove-outdated-stallion-contact-information 2004-07-12 18:14:46.384127784 -0700 +++ 25-akpm/include/linux/cd1400.h 2004-07-12 18:14:46.405124592 -0700 @@ -3,7 +3,7 @@ /* * cd1400.h -- cd1400 UART hardware info. * - * Copyright (C) 1996-1998 Stallion Technologies (support@stallion.oz.au). + * Copyright (C) 1996-1998 Stallion Technologies * Copyright (C) 1994-1996 Greg Ungerer. * * This program is free software; you can redistribute it and/or modify diff -puN include/linux/cdk.h~remove-outdated-stallion-contact-information include/linux/cdk.h --- 25/include/linux/cdk.h~remove-outdated-stallion-contact-information 2004-07-12 18:14:46.385127632 -0700 +++ 25-akpm/include/linux/cdk.h 2004-07-12 18:14:46.406124440 -0700 @@ -3,7 +3,7 @@ /* * cdk.h -- CDK interface definitions. * - * Copyright (C) 1996-1998 Stallion Technologies (support@stallion.oz.au). + * Copyright (C) 1996-1998 Stallion Technologies * Copyright (C) 1994-1996 Greg Ungerer. * * This program is free software; you can redistribute it and/or modify diff -puN include/linux/comstats.h~remove-outdated-stallion-contact-information include/linux/comstats.h --- 25/include/linux/comstats.h~remove-outdated-stallion-contact-information 2004-07-12 18:14:46.387127328 -0700 +++ 25-akpm/include/linux/comstats.h 2004-07-12 18:14:46.405124592 -0700 @@ -3,7 +3,7 @@ /* * comstats.h -- Serial Port Stats. * - * Copyright (C) 1996-1998 Stallion Technologies (support@stallion.oz.au). + * Copyright (C) 1996-1998 Stallion Technologies * Copyright (C) 1994-1996 Greg Ungerer. * * This program is free software; you can redistribute it and/or modify diff -puN include/linux/istallion.h~remove-outdated-stallion-contact-information include/linux/istallion.h --- 25/include/linux/istallion.h~remove-outdated-stallion-contact-information 2004-07-12 18:14:46.388127176 -0700 +++ 25-akpm/include/linux/istallion.h 2004-07-12 18:14:46.405124592 -0700 @@ -3,7 +3,7 @@ /* * istallion.h -- stallion intelligent multiport serial driver. * - * Copyright (C) 1996-1998 Stallion Technologies (support@stallion.oz.au). + * Copyright (C) 1996-1998 Stallion Technologies * Copyright (C) 1994-1996 Greg Ungerer. * * This program is free software; you can redistribute it and/or modify diff -puN include/linux/sc26198.h~remove-outdated-stallion-contact-information include/linux/sc26198.h --- 25/include/linux/sc26198.h~remove-outdated-stallion-contact-information 2004-07-12 18:14:46.390126872 -0700 +++ 25-akpm/include/linux/sc26198.h 2004-07-12 18:14:46.406124440 -0700 @@ -3,7 +3,7 @@ /* * sc26198.h -- SC26198 UART hardware info. * - * Copyright (C) 1995-1998 Stallion Technologies (support@stallion.oz.au). + * Copyright (C) 1995-1998 Stallion Technologies * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -puN include/linux/stallion.h~remove-outdated-stallion-contact-information include/linux/stallion.h --- 25/include/linux/stallion.h~remove-outdated-stallion-contact-information 2004-07-12 18:14:46.391126720 -0700 +++ 25-akpm/include/linux/stallion.h 2004-07-12 18:14:46.407124288 -0700 @@ -3,7 +3,7 @@ /* * stallion.h -- stallion multiport serial driver. * - * Copyright (C) 1996-1998 Stallion Technologies (support@stallion.oz.au). + * Copyright (C) 1996-1998 Stallion Technologies * Copyright (C) 1994-1996 Greg Ungerer. * * This program is free software; you can redistribute it and/or modify diff -puN MAINTAINERS~remove-outdated-stallion-contact-information MAINTAINERS --- 25/MAINTAINERS~remove-outdated-stallion-contact-information 2004-07-12 18:14:46.392126568 -0700 +++ 25-akpm/MAINTAINERS 2004-07-12 18:14:46.397125808 -0700 @@ -1981,11 +1981,6 @@ M: jbglaw@lug-owl.de L: linux-kernel@vger.kernel.org S: Maintained -STALLION TECHNOLOGIES MULTIPORT SERIAL BOARDS -M: support@stallion.oz.au -W: http://www.stallion.com -S: Supported - STARFIRE/DURALAN NETWORK DRIVER P: Ion Badulescu M: ionut@cs.columbia.edu _