summaryrefslogtreecommitdiff
path: root/drivers/watchdog/mpcore_wdt.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-23 08:55:47 +0100
committerIngo Molnar <mingo@elte.hu>2008-11-23 08:55:47 +0100
commitca9eed76133c00e7f4b1eeb4c1a6cb800cd2654c (patch)
tree5f011f4bd00c921e41605b1915c227aeaf411a0d /drivers/watchdog/mpcore_wdt.c
parent8652cb4b0d87accbe78725fd2a13be2787059649 (diff)
parent13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff)
Merge commit 'v2.6.28-rc6' into x86/debug
Diffstat (limited to 'drivers/watchdog/mpcore_wdt.c')
-rw-r--r--drivers/watchdog/mpcore_wdt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/mpcore_wdt.c b/drivers/watchdog/mpcore_wdt.c
index 2a9bfa81f9d6..1130ad697ce2 100644
--- a/drivers/watchdog/mpcore_wdt.c
+++ b/drivers/watchdog/mpcore_wdt.c
@@ -4,8 +4,8 @@
* (c) Copyright 2004 ARM Limited
*
* Based on the SoftDog driver:
- * (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