diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
| commit | dba0a918722ee0f0ba3442575e4448c3ab622be4 (patch) | |
| tree | fdb466cf09e7916135098d651b18924b2fe9ba5f /drivers/watchdog/sb_wdog.c | |
| parent | 0996e6382482ce9014787693d3884e9468153a5c (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'drivers/watchdog/sb_wdog.c')
| -rw-r--r-- | drivers/watchdog/sb_wdog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c index 27e526a07c9a..38f5831c9291 100644 --- a/drivers/watchdog/sb_wdog.c +++ b/drivers/watchdog/sb_wdog.c | |||
| @@ -35,8 +35,8 @@ | |||
| 35 | * Based on various other watchdog drivers, which are probably all | 35 | * Based on various other watchdog drivers, which are probably all |
| 36 | * loosely based on something Alan Cox wrote years ago. | 36 | * loosely based on something Alan Cox wrote years ago. |
| 37 | * | 37 | * |
| 38 | * (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved. | 38 | * (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>, |
| 39 | * http://www.redhat.com | 39 | * All Rights Reserved. |
| 40 | * | 40 | * |
| 41 | * This program is free software; you can redistribute it and/or | 41 | * This program is free software; you can redistribute it and/or |
| 42 | * modify it under the terms of the GNU General Public License | 42 | * modify it under the terms of the GNU General Public License |