diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
| commit | a1744d3bee19d3b9cbfb825ab316a101b9c9f109 (patch) | |
| tree | c0e2324c09beca0eb5782eb5abf241ea2b7a4a11 /drivers/watchdog/wdt285.c | |
| parent | 275f165fa970174f8a98205529750e8abb6c0a33 (diff) | |
| parent | a432226614c5616e3cfd211e0acffa0acfb4770c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/p54/p54common.c
Diffstat (limited to 'drivers/watchdog/wdt285.c')
| -rw-r--r-- | drivers/watchdog/wdt285.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/watchdog/wdt285.c b/drivers/watchdog/wdt285.c index 191ea6302107..f55135662d78 100644 --- a/drivers/watchdog/wdt285.c +++ b/drivers/watchdog/wdt285.c | |||
| @@ -6,7 +6,8 @@ | |||
| 6 | * | 6 | * |
| 7 | * SoftDog 0.05: A Software Watchdog Device | 7 | * SoftDog 0.05: A Software Watchdog Device |
| 8 | * | 8 | * |
| 9 | * (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved. | 9 | * (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>, |
| 10 | * All Rights Reserved. | ||
| 10 | * | 11 | * |
| 11 | * This program is free software; you can redistribute it and/or | 12 | * This program is free software; you can redistribute it and/or |
| 12 | * modify it under the terms of the GNU General Public License | 13 | * modify it under the terms of the GNU General Public License |