Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[PATCH] Switch all my contributions stuff to a single common address
[WATCHDOG] pci: use pci_ioremap_bar() in drivers/watchdog

drivers/watchdog/acquirewdt.c

···
  *
  *      Based on wdt.c. Original copyright messages:
  *
- *	(c) Copyright 1996 Alan Cox <[e-mail]>, All Rights Reserved.
- *				http://www.redhat.com
+ *	(c) Copyright 1996 Alan Cox <[e-mail]>,
+ *						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
···
  *	warranty for any of this software. This material is provided
  *	"AS-IS" and at no charge.
  *
- *	(c) Copyright 1995    Alan Cox <[e-mail]>
+ *	(c) Copyright 1995    Alan Cox <[e-mail]>
  *
  *      14-Dec-2001 Matt Domsch <[e-mail]>
  *          Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT

drivers/watchdog/advantechwdt.c

···
  *	Based on acquirewdt.c which is based on wdt.c.
  *	Original copyright messages:
  *
- *	(c) Copyright 1996 Alan Cox <[e-mail]>, All Rights Reserved.
- *				http://www.redhat.com
+ *	(c) Copyright 1996 Alan Cox <[e-mail]>,
+ *						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
···
  *	warranty for any of this software. This material is provided
  *	"AS-IS" and at no charge.
  *
- *	(c) Copyright 1995    Alan Cox <[e-mail]>
+ *	(c) Copyright 1995    Alan Cox <[e-mail]>
  *
  *	14-Dec-2001 Matt Domsch <[e-mail]>
  *	    Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT

drivers/watchdog/bfin_wdt.c

···
  * Originally based on softdog.c
  * Copyright 2006-2007 Analog Devices Inc.
  * Copyright 2006-2007 Michele d'Amico
- * Copyright 1996 Alan Cox <[e-mail]>
+ * Copyright 1996 Alan Cox <[e-mail]>
  *
  * Enter bugs at http://blackfin.uclinux.org/
  *

drivers/watchdog/eurotechwdt.c

···
  *	Based on wdt.c.
  *	Original copyright messages:
  *
- *      (c) Copyright 1996-1997 Alan Cox <[e-mail]>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996-1997 Alan Cox <[e-mail]>,
+ *						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

drivers/watchdog/i6300esb.c

···
 			goto err_disable;
 		}
 
-		BASEADDR = ioremap(pci_resource_start(esb_pci, 0),
-				   pci_resource_len(esb_pci, 0));
+		BASEADDR = pci_ioremap_bar(esb_pci, 0);
 		if (BASEADDR == NULL) {
 			/* Something's wrong here, BASEADDR has to be set */
 			printk(KERN_ERR PFX "failed to get BASEADDR\n");

drivers/watchdog/ib700wdt.c

···
  *	Based on acquirewdt.c which is based on wdt.c.
  *	Original copyright messages:
  *
- *	(c) Copyright 1996 Alan Cox <[e-mail]>, All Rights Reserved.
- *				http://www.redhat.com
+ *	(c) Copyright 1996 Alan Cox <[e-mail]>,
+ *						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
···
  *	warranty for any of this software. This material is provided
  *	"AS-IS" and at no charge.
  *
- *	(c) Copyright 1995    Alan Cox <[e-mail]>
+ *	(c) Copyright 1995    Alan Cox <[e-mail]>
  *
  *	14-Dec-2001 Matt Domsch <[e-mail]>
  *	     Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT

drivers/watchdog/indydog.c

···
  *	as published by the Free Software Foundation; either version
  *	2 of the License, or (at your option) any later version.
  *
- *	based on softdog.c by Alan Cox <[e-mail]>
+ *	based on softdog.c by Alan Cox <[e-mail]>
  */
 
 #include <linux/module.h>

drivers/watchdog/mpcore_wdt.c

···
  *	(c) Copyright 2004 ARM Limited
  *
  *	Based on the SoftDog driver:
- *	(c) Copyright 1996 Alan Cox <[e-mail]>, All Rights Reserved.
- *				http://www.redhat.com
+ *	(c) Copyright 1996 Alan Cox <[e-mail]>,
+ * 						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

drivers/watchdog/omap_wdt.c

···
  * 20030527: George G. Davis <[e-mail]>
  *	Initially based on linux-2.4.19-rmk7-pxa1/drivers/char/sa1100_wdt.c
  *	(c) Copyright 2000 Oleg Drokin <[e-mail]>
- *	Based on SoftDog driver by Alan Cox <[e-mail]>
+ *	Based on SoftDog driver by Alan Cox <[e-mail]>
  *
  * Copyright (c) 2004 Texas Instruments.
  *	1. Modified to support OMAP1610 32-KHz watchdog timer

drivers/watchdog/pcwd_pci.c

···
  *	Based on source code of the following authors:
  *	  Ken Hollis <[e-mail]>,
  *	  Lindsay Harris <[e-mail]>,
- *	  Alan Cox <[e-mail]>,
+ *	  Alan Cox <[e-mail]>,
  *	  Matt Domsch <[e-mail]>,
  *	  Rob Radez <[e-mail]>
  *

drivers/watchdog/pcwd_usb.c

···
  *
  *	Based on source code of the following authors:
  *	  Ken Hollis <[e-mail]>,
- *	  Alan Cox <[e-mail]>,
+ *	  Alan Cox <[e-mail]>,
  *	  Matt Domsch <[e-mail]>,
  *	  Rob Radez <[e-mail]>,
  *	  Greg Kroah-Hartman <[e-mail]>

drivers/watchdog/rc32434_wdt.c

···
  *  based on
  *  SoftDog 0.05:	A Software Watchdog Device
  *
- *  (c) Copyright 1996 Alan Cox <[e-mail]>, All Rights Reserved.
+ *  (c) Copyright 1996 Alan Cox <[e-mail]>,
+ *					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

drivers/watchdog/s3c2410_wdt.c

···
  * S3C2410 Watchdog Timer Support
  *
  * Based on, softdog.c by Alan Cox,
- *     (c) Copyright 1996 Alan Cox <[e-mail]>
+ *     (c) Copyright 1996 Alan Cox <[e-mail]>
  *
  * 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

drivers/watchdog/sa1100_wdt.c

···
  *	Watchdog driver for the SA11x0/PXA2xx
  *
  *      (c) Copyright 2000 Oleg Drokin <[e-mail]>
- *          Based on SoftDog driver by Alan Cox <[e-mail]>
+ *          Based on SoftDog driver by Alan Cox <[e-mail]>
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License

drivers/watchdog/sb_wdog.c

···
  * Based on various other watchdog drivers, which are probably all
  * loosely based on something Alan Cox wrote years ago.
  *
- *	(c) Copyright 1996 Alan Cox <[e-mail]>, All Rights Reserved.
- *				http://www.redhat.com
+ *	(c) Copyright 1996 Alan Cox <[e-mail]>,
+ *						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

drivers/watchdog/sbc8360.c

···
  *	Based on acquirewdt.c which is based on wdt.c.
  *	Original copyright messages:
  *
- *	(c) Copyright 1996 Alan Cox <[e-mail]>, All Rights Reserved.
- *				http://www.redhat.com
+ *	(c) Copyright 1996 Alan Cox <[e-mail]>,
+ *						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
···
  *	warranty for any of this software. This material is provided
  *	"AS-IS" and at no charge.
  *
- *	(c) Copyright 1995    Alan Cox <[e-mail]>
+ *	(c) Copyright 1995    Alan Cox <[e-mail]>
  *
  *      14-Dec-2001 Matt Domsch <[e-mail]>
  *           Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT

drivers/watchdog/sbc_epx_c3.c

···
  *	as published by the Free Software Foundation; either version
  *	2 of the License, or (at your option) any later version.
  *
- *	based on softdog.c by Alan Cox <[e-mail]>
+ *	based on softdog.c by Alan Cox <[e-mail]>
  */
 
 #include <linux/module.h>

drivers/watchdog/smsc37b787_wdt.c

···
 /*
  *	SMsC 37B787 Watchdog Timer driver for Linux 2.6.x.x
  *
- *      Based on acquirewdt.c by Alan Cox <[e-mail]>
+ *	Based on acquirewdt.c by Alan Cox <[e-mail]>
  *       and some other existing drivers
  *
  *	This program is free software; you can redistribute it and/or

drivers/watchdog/softdog.c

···
 /*
  *	SoftDog	0.07:	A Software Watchdog Device
  *
- *	(c) Copyright 1996 Alan Cox <[e-mail]>, All Rights Reserved.
- *				http://www.redhat.com
+ *	(c) Copyright 1996 Alan Cox <[e-mail]>, 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

drivers/watchdog/w83627hf_wdt.c

···
  *
  *	(c) Copyright 2000-2001 Marek Michalkiewicz <[e-mail]>
  *
- *	(c) Copyright 1996 Alan Cox <[e-mail]>, All Rights Reserved.
- *				http://www.redhat.com
+ *	(c) Copyright 1996 Alan Cox <[e-mail]>,
+ *						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
···
  *	warranty for any of this software. This material is provided
  *	"AS-IS" and at no charge.
  *
- *	(c) Copyright 1995    Alan Cox <[e-mail]>
+ *	(c) Copyright 1995    Alan Cox <[e-mail]>
  */
 
 #include <linux/module.h>

drivers/watchdog/w83697hf_wdt.c

···
  *
  *	(c) Copyright 2000-2001 Marek Michalkiewicz <[e-mail]>
  *
- *	(c) Copyright 1996 Alan Cox <[e-mail]>, All Rights Reserved.
- *				http://www.redhat.com
+ *	(c) Copyright 1996 Alan Cox <[e-mail]>,
+ *						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

drivers/watchdog/wafer5823wdt.c

···
  *	Based on advantechwdt.c which is based on wdt.c.
  *	Original copyright messages:
  *
- *	(c) Copyright 1996-1997 Alan Cox <[e-mail]>, All Rights Reserved.
- *				http://www.redhat.com
+ *	(c) Copyright 1996-1997 Alan Cox <[e-mail]>,
+ *						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

drivers/watchdog/wdt.c

···
 /*
  *	Industrial Computer Source WDT500/501 driver
  *
- *	(c) Copyright 1996-1997 Alan Cox <[e-mail]>, All Rights Reserved.
- *				http://www.redhat.com
+ *	(c) Copyright 1996-1997 Alan Cox <[e-mail]>,
+ *						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

drivers/watchdog/wdt285.c

···
  *
  *	SoftDog	0.05:	A Software Watchdog Device
  *
- *	(c) Copyright 1996 Alan Cox <[e-mail]>, All Rights Reserved.
+ *	(c) Copyright 1996 Alan Cox <[e-mail]>,
+ *						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

drivers/watchdog/wdt_pci.c

···
 /*
  *	Industrial Computer Source PCI-WDT500/501 driver
  *
- *	(c) Copyright 1996-1997 Alan Cox <[e-mail]>, All Rights Reserved.
- *				http://www.redhat.com
+ *	(c) Copyright 1996-1997 Alan Cox <[e-mail]>,
+ *						 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