diff options
author | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 08:18:02 +0100 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 08:18:02 +0100 |
commit | 0803d540db06f53acd2fabf1347d5b665218f14a (patch) | |
tree | f5f8e5510a76bb59d3583478961daf5afc32df08 /drivers/ata/pata_scc.c | |
parent | sh: Fix up the shared IRQ demuxer's control bit testing logic. (diff) | |
parent | Merge branch 'for-linus' of git://neil.brown.name/md (diff) | |
download | linux-0803d540db06f53acd2fabf1347d5b665218f14a.tar.xz linux-0803d540db06f53acd2fabf1347d5b665218f14a.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 16673d168573..cf3707e516a2 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. |