diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-28 09:42:48 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-28 09:42:48 -0700 |
commit | 3c136f29ba5ae8dfcae4958bbcb581420b43a74d (patch) | |
tree | d73f3f235a5c3dda8fe0b3c4610625a024749cdb /drivers/ata/pata_scc.c | |
parent | 49fdf6785fd660e18a1eb4588928f47e9fa29a9a (diff) | |
parent | 87943acf60898a3efb6b5ee85d4cc789898bf5e8 (diff) |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: ahci enclosure management bit mask
libata: ahci enclosure management led sync
pata_ninja32: suspend/resume support
libata: Fix LBA48 on pata_it821x RAID volumes.
libata: clear saved xfer_mode and ncq_enabled on device detach
sata_sil24: configure max read request size to 4k
libata: add missing kernel-doc
libata: fix device iteration bugs
ahci: Add support for Promise PDC42819
ata: Switch all my stuff to a common address
Diffstat (limited to 'drivers/ata/pata_scc.c')
-rw-r--r-- | drivers/ata/pata_scc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c index 16673d16857..cf3707e516a 100644 --- a/drivers/ata/pata_scc.c +++ b/drivers/ata/pata_scc.c @@ -8,7 +8,7 @@ * Copyright 2003-2005 Jeff Garzik * Copyright (C) 1998-1999 Andrzej Krzysztofowicz, Author and Maintainer * Copyright (C) 1998-2000 Andre Hedrick <andre@linux-ide.org> - * Copyright (C) 2003 Red Hat Inc <alan@redhat.com> + * Copyright (C) 2003 Red Hat Inc * * and drivers/ata/ahci.c: * Copyright 2004-2005 Red Hat, Inc. |