diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 12:54:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 12:54:03 -0700 |
| commit | 814b3bed63c23f310121befa0fe004a20dec95b2 (patch) | |
| tree | 88a8ce02ee9d74dff2e58f75b98d0ce60621ab0a /drivers/watchdog/pcwd_pci.c | |
| parent | e61467e9b6c88e97560873603cf9aceaf7435480 (diff) | |
| parent | 29fa0586de4fe518f122a915b8c6e92d12e8ca7f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[PATCH] Switch all my contributions stuff to a single common address
[WATCHDOG] pci: use pci_ioremap_bar() in drivers/watchdog
Diffstat (limited to 'drivers/watchdog/pcwd_pci.c')
| -rw-r--r-- | drivers/watchdog/pcwd_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/pcwd_pci.c b/drivers/watchdog/pcwd_pci.c index 90eb1d4271d..5d76422c402 100644 --- a/drivers/watchdog/pcwd_pci.c +++ b/drivers/watchdog/pcwd_pci.c @@ -6,7 +6,7 @@ * Based on source code of the following authors: * Ken Hollis <kenji@bitgate.com>, * Lindsay Harris <lindsay@bluegum.com>, - * Alan Cox <alan@redhat.com>, + * Alan Cox <alan@lxorguk.ukuu.org.uk>, * Matt Domsch <Matt_Domsch@dell.com>, * Rob Radez <rob@osinvestor.com> * |