diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-20 23:39:47 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-20 23:39:47 +0100 |
| commit | 55fa518867978e1f5fd8353098f80d125ac734d7 (patch) | |
| tree | 3502b331c1f9ec4cac25dc8ba30b6a0a324e350c /drivers/watchdog/pcwd_usb.c | |
| parent | ALSA: ca0106 MSI K8N Diamond MB spi_dac 2->1 (diff) | |
| parent | ALSA: pcsp - Fix starting the stream with HRTIMER_CB_IRQSAFE_UNLOCK (diff) | |
| download | linux-55fa518867978e1f5fd8353098f80d125ac734d7.tar.xz linux-55fa518867978e1f5fd8353098f80d125ac734d7.zip | |
Merge branch 'topic/pcsp-fix' into topic/misc
Diffstat (limited to 'drivers/watchdog/pcwd_usb.c')
| -rw-r--r-- | drivers/watchdog/pcwd_usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c index c1685c942de6..afb089695da8 100644 --- a/drivers/watchdog/pcwd_usb.c +++ b/drivers/watchdog/pcwd_usb.c @@ -5,7 +5,7 @@ * * Based on source code of the following authors: * Ken Hollis <kenji@bitgate.com>, - * Alan Cox <alan@redhat.com>, + * Alan Cox <alan@lxorguk.ukuu.org.uk>, * Matt Domsch <Matt_Domsch@dell.com>, * Rob Radez <rob@osinvestor.com>, * Greg Kroah-Hartman <greg@kroah.com> |