diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-02 13:32:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-02 13:32:26 -0800 |
| commit | ae29a18594c40a344ddd5bcd6abe575786a5d978 (patch) | |
| tree | 07e4e7e49ca0a891735e9da20929ddf61606c7ba /drivers/ide/scc_pata.c | |
| parent | 0bf82cccd1e17135f880c161bc7926f5b25df34c (diff) | |
| parent | 52ebb438e952c674e5a5c131292589db9bcf169b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ide-gd: re-get capacity on revalidate
tx4938ide: Avoid underflow on calculation of a wait cycle
tx4938ide: Do not call devm_ioremap for whole 128KB
tx4938ide: Check minimum cycle time and SHWT range (v2)
ide: Switch to a common address
ide-cd: fix DMA alignment regression
Diffstat (limited to 'drivers/ide/scc_pata.c')
| -rw-r--r-- | drivers/ide/scc_pata.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c index f26aa5d54ef..0f48f9dacfa 100644 --- a/drivers/ide/scc_pata.c +++ b/drivers/ide/scc_pata.c @@ -5,7 +5,7 @@ * * This code is based on drivers/ide/pci/siimage.c: * Copyright (C) 2001-2002 Andre Hedrick <andre@linux-ide.org> - * Copyright (C) 2003 Red Hat <alan@redhat.com> + * Copyright (C) 2003 Red Hat * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by |