[PATCH] Switch all my contributions stuff to a single common address

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c
index 6e46a55..3e57aa4 100644 (file)
--- a/drivers/watchdog/acquirewdt.c
+++ b/drivers/watchdog/acquirewdt.c
@@ -3,8 +3,8 @@
  *
  *      Based on wdt.c. Original copyright messages:
  *
- *     (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                             http://www.redhat.com
+ *     (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                             All Rights Reserved.
  *
  *     This program is free software; you can redistribute it and/or
  *     modify it under the terms of the GNU General Public License
@@ -15,7 +15,7 @@
  *     warranty for any of this software. This material is provided
  *     "AS-IS" and at no charge.
  *
- *     (c) Copyright 1995    Alan Cox <alan@redhat.com>
+ *     (c) Copyright 1995    Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  *      14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com>
  *          Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT

diff --git a/drivers/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c
index a5110f9..a1d7856 100644 (file)
--- a/drivers/watchdog/advantechwdt.c
+++ b/drivers/watchdog/advantechwdt.c
@@ -6,8 +6,8 @@
  *     Based on acquirewdt.c which is based on wdt.c.
  *     Original copyright messages:
  *
- *     (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                             http://www.redhat.com
+ *     (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                             All Rights Reserved.
  *
  *     This program is free software; you can redistribute it and/or
  *     modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
  *     warranty for any of this software. This material is provided
  *     "AS-IS" and at no charge.
  *
- *     (c) Copyright 1995    Alan Cox <alan@redhat.com>
+ *     (c) Copyright 1995    Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  *     14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com>
  *         Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT

diff --cc drivers/watchdog/bfin_wdt.c
Simple merge

diff --cc drivers/watchdog/eurotechwdt.c
Simple merge

diff --cc drivers/watchdog/ib700wdt.c
Simple merge

diff --cc drivers/watchdog/indydog.c
Simple merge

diff --cc drivers/watchdog/mpcore_wdt.c
Simple merge

diff --cc drivers/watchdog/omap_wdt.c
Simple merge

diff --cc drivers/watchdog/pcwd_pci.c
Simple merge

diff --cc drivers/watchdog/pcwd_usb.c
Simple merge

diff --cc drivers/watchdog/rc32434_wdt.c
Simple merge

diff --cc drivers/watchdog/s3c2410_wdt.c
Simple merge

diff --cc drivers/watchdog/sa1100_wdt.c
Simple merge

diff --cc drivers/watchdog/sb_wdog.c
Simple merge

diff --cc drivers/watchdog/sbc8360.c
Simple merge

diff --cc drivers/watchdog/sbc_epx_c3.c
Simple merge

diff --cc drivers/watchdog/smsc37b787_wdt.c
Simple merge

diff --cc drivers/watchdog/softdog.c
Simple merge

diff --cc drivers/watchdog/w83627hf_wdt.c
Simple merge

diff --cc drivers/watchdog/w83697hf_wdt.c
Simple merge

diff --cc drivers/watchdog/wafer5823wdt.c
Simple merge

diff --cc drivers/watchdog/wdt.c
Simple merge

diff --cc drivers/watchdog/wdt285.c
Simple merge

diff --cc drivers/watchdog/wdt_pci.c
Simple merge