diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 09:49:01 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 09:49:01 -0500 |
| commit | e856359685143a2f65876e7db4e4aa0ef5dce7f0 (patch) | |
| tree | bbcafe7f23975979f7a2bc6fd1404908d5fd7bd1 /drivers/watchdog/bfin_wdt.c | |
| parent | e3bd9ec5d8bfc90f9e1bd995677829e57a404061 (diff) | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c-moves2
Diffstat (limited to 'drivers/watchdog/bfin_wdt.c')
| -rw-r--r-- | drivers/watchdog/bfin_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/bfin_wdt.c b/drivers/watchdog/bfin_wdt.c index 31b42253054e..067a57cb3f82 100644 --- a/drivers/watchdog/bfin_wdt.c +++ b/drivers/watchdog/bfin_wdt.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | * Originally based on softdog.c | 5 | * Originally based on softdog.c |
| 6 | * Copyright 2006-2007 Analog Devices Inc. | 6 | * Copyright 2006-2007 Analog Devices Inc. |
| 7 | * Copyright 2006-2007 Michele d'Amico | 7 | * Copyright 2006-2007 Michele d'Amico |
| 8 | * Copyright 1996 Alan Cox <alan@redhat.com> | 8 | * Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk> |
| 9 | * | 9 | * |
| 10 | * Enter bugs at http://blackfin.uclinux.org/ | 10 | * Enter bugs at http://blackfin.uclinux.org/ |
| 11 | * | 11 | * |