diff options
author | James Morris | 2009-03-28 04:57:13 +0100 |
---|---|---|
committer | James Morris | 2009-03-28 04:57:13 +0100 |
commit | bb798169d1bb860b07192cf9c75937fadc8610b4 (patch) | |
tree | fa67f14406a1e79897e6f29e59fed7c02ec31c30 /drivers/watchdog/mtx-1_wdt.c | |
parent | TOMOYO: Fix a typo. (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
download | kernel-qcow2-linux-bb798169d1bb860b07192cf9c75937fadc8610b4.tar.gz kernel-qcow2-linux-bb798169d1bb860b07192cf9c75937fadc8610b4.tar.xz kernel-qcow2-linux-bb798169d1bb860b07192cf9c75937fadc8610b4.zip |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
Diffstat (limited to 'drivers/watchdog/mtx-1_wdt.c')
-rw-r--r-- | drivers/watchdog/mtx-1_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c index 3acce623f209..539b6f6ba7f1 100644 --- a/drivers/watchdog/mtx-1_wdt.c +++ b/drivers/watchdog/mtx-1_wdt.c @@ -5,7 +5,7 @@ * All Rights Reserved. * http://www.4g-systems.biz * - * (C) Copyright 2007 OpenWrt.org, Florian Fainelli <florian@openwrt.org> + * (C) Copyright 2007 OpenWrt.org, Florian Fainelli <florian@openwrt.org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License |