diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-03 02:57:41 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-03 02:57:41 -0500 |
| commit | db5935001a43528e673ad26ffec9d98c60a496a9 (patch) | |
| tree | 8e735327a97beccabb5d94ef93df25d2bacda705 /drivers/watchdog/sbc8360.c | |
| parent | 34f3a814eef8069a24e5b3ebcf27aba9dabac2ea (diff) | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
Merge commit 'v2.6.28-rc3' into sched/core
Diffstat (limited to 'drivers/watchdog/sbc8360.c')
| -rw-r--r-- | drivers/watchdog/sbc8360.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/sbc8360.c b/drivers/watchdog/sbc8360.c index fd83dd052d8c..ae74f6bcfa23 100644 --- a/drivers/watchdog/sbc8360.c +++ b/drivers/watchdog/sbc8360.c | |||
| @@ -16,8 +16,8 @@ | |||
| 16 | * Based on acquirewdt.c which is based on wdt.c. | 16 | * Based on acquirewdt.c which is based on wdt.c. |
| 17 | * Original copyright messages: | 17 | * Original copyright messages: |
| 18 | * | 18 | * |
| 19 | * (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved. | 19 | * (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>, |
| 20 | * http://www.redhat.com | 20 | * All Rights Reserved. |
| 21 | * | 21 | * |
| 22 | * This program is free software; you can redistribute it and/or | 22 | * This program is free software; you can redistribute it and/or |
| 23 | * modify it under the terms of the GNU General Public License | 23 | * modify it under the terms of the GNU General Public License |
| @@ -28,7 +28,7 @@ | |||
| 28 | * warranty for any of this software. This material is provided | 28 | * warranty for any of this software. This material is provided |
| 29 | * "AS-IS" and at no charge. | 29 | * "AS-IS" and at no charge. |
| 30 | * | 30 | * |
| 31 | * (c) Copyright 1995 Alan Cox <alan@redhat.com> | 31 | * (c) Copyright 1995 Alan Cox <alan@lxorguk.ukuu.org.uk> |
| 32 | * | 32 | * |
| 33 | * 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com> | 33 | * 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com> |
| 34 | * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT | 34 | * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT |