diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 22:54:03 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 22:54:03 +0300 |
| commit | 814b3bed63c23f310121befa0fe004a20dec95b2 (patch) | |
| tree | 88a8ce02ee9d74dff2e58f75b98d0ce60621ab0a /drivers/watchdog/advantechwdt.c | |
| parent | e61467e9b6c88e97560873603cf9aceaf7435480 (diff) | |
| parent | 29fa0586de4fe518f122a915b8c6e92d12e8ca7f (diff) | |
| download | linux-814b3bed63c23f310121befa0fe004a20dec95b2.tar.xz | |
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
Diffstat (limited to 'drivers/watchdog/advantechwdt.c')
| -rw-r--r-- | drivers/watchdog/advantechwdt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c index a5110f93a755..a1d7856ea6e0 100644 --- 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 |