diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-11-03 09:11:13 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-03 09:11:13 +0100 |
commit | 36609469c8278554b046aa4cc9a5fa9ccea35306 (patch) | |
tree | f59185b71c8059941de79143f71178453599b8f1 /drivers/watchdog/wdt.c | |
parent | b3acf29afda06c76774dc6df6246c37ae707836b (diff) | |
parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
download | op-kernel-dev-36609469c8278554b046aa4cc9a5fa9ccea35306.zip op-kernel-dev-36609469c8278554b046aa4cc9a5fa9ccea35306.tar.gz |
Merge commit 'v2.6.28-rc3' into tracing/ftrace
Diffstat (limited to 'drivers/watchdog/wdt.c')
-rw-r--r-- | drivers/watchdog/wdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/wdt.c b/drivers/watchdog/wdt.c index deeebb2..eddb918 100644 --- a/drivers/watchdog/wdt.c +++ b/drivers/watchdog/wdt.c @@ -1,8 +1,8 @@ /* * Industrial Computer Source WDT500/501 driver * - * (c) Copyright 1996-1997 Alan Cox <alan@redhat.com>, All Rights Reserved. - * http://www.redhat.com + * (c) Copyright 1996-1997 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 |