diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-10-30 10:26:11 +0000 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-10-30 10:26:11 +0000 |
commit | 2231b3729eb92f163bbe64b604410ee451b2c42b (patch) | |
tree | 4b4043cda9bfcf0912839edbb64484763853bd33 /drivers/ata/pata_pcmcia.c | |
parent | b99053eefce89c5c8500517f5f065c85b57d98ee (diff) | |
parent | e946217e4fdaa67681bbabfa8e6b18641921f750 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c64xx
Diffstat (limited to 'drivers/ata/pata_pcmcia.c')
-rw-r--r-- | drivers/ata/pata_pcmcia.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c index 02b596b9cf6..271cb64d429 100644 --- a/drivers/ata/pata_pcmcia.c +++ b/drivers/ata/pata_pcmcia.c @@ -1,6 +1,6 @@ /* * pata_pcmcia.c - PCMCIA PATA controller driver. - * Copyright 2005-2006 Red Hat Inc <alan@redhat.com>, all rights reserved. + * Copyright 2005-2006 Red Hat Inc, all rights reserved. * PCMCIA ident update Copyright 2006 Marcin Juszkiewicz * <openembedded@hrw.one.pl> * |