diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 03:18:02 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 03:18:02 -0400 |
| commit | 0803d540db06f53acd2fabf1347d5b665218f14a (patch) | |
| tree | f5f8e5510a76bb59d3583478961daf5afc32df08 /drivers/watchdog/w83697hf_wdt.c | |
| parent | a8884e3415c29c58a5875d54c109c4a7fcaa6fb4 (diff) | |
| parent | 721d5dfe7e516954c501d5e9d0dfab379cf4241a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/watchdog/w83697hf_wdt.c')
| -rw-r--r-- | drivers/watchdog/w83697hf_wdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/w83697hf_wdt.c b/drivers/watchdog/w83697hf_wdt.c index 445d30a01ed3..3c7aa412b1f3 100644 --- a/drivers/watchdog/w83697hf_wdt.c +++ b/drivers/watchdog/w83697hf_wdt.c | |||
| @@ -12,8 +12,8 @@ | |||
| 12 | * | 12 | * |
| 13 | * (c) Copyright 2000-2001 Marek Michalkiewicz <marekm@linux.org.pl> | 13 | * (c) Copyright 2000-2001 Marek Michalkiewicz <marekm@linux.org.pl> |
| 14 | * | 14 | * |
| 15 | * (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved. | 15 | * (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>, |
| 16 | * http://www.redhat.com | 16 | * All Rights Reserved. |
| 17 | * | 17 | * |
| 18 | * This program is free software; you can redistribute it and/or | 18 | * This program is free software; you can redistribute it and/or |
| 19 | * modify it under the terms of the GNU General Public License | 19 | * modify it under the terms of the GNU General Public License |