Merge branch 'linus' into x86/uv

[cascardo/linux.git] / drivers / ata / pata_cypress.c

diff --git a/drivers/ata/pata_cypress.c b/drivers/ata/pata_cypress.c
index 2ff6260..d546425 100644 (file)
--- a/drivers/ata/pata_cypress.c
+++ b/drivers/ata/pata_cypress.c
@@ -1,7 +1,7 @@
 /*
  * pata_cypress.c      - Cypress PATA for new ATA layer
  *                       (C) 2006 Red Hat Inc
- *                       Alan Cox <alan@redhat.com>
+ *                       Alan Cox
  *
  * Based heavily on
  * linux/drivers/ide/pci/cy82c693.c            Version 0.40    Sep. 10, 2002