Alan's Miscellaneous Tree

index f123553..fd72e42 100644
@@ -147,7 +147,7 @@ static int airo_probe(struct pcmcia_device *p_dev)
 	DEBUG(0, "airo_attach()\n");
 
 	/* Interrupt setup */
-	p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
+	p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
 	p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID;
 	p_dev->irq.Handler = NULL;
 	

index 12617cd..d2388e8 100644
@@ -158,7 +158,7 @@ static int atmel_probe(struct pcmcia_device *p_dev)
 	DEBUG(0, "atmel_attach()\n");
 
 	/* Interrupt setup */
-	p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
+	p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
 	p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID;
 	p_dev->irq.Handler = NULL;
 

index f479c1a..25bae79 100644
@@ -398,7 +398,7 @@ static int netwave_probe(struct pcmcia_device *link)
     link->io.IOAddrLines = 5;
     
     /* Interrupt setup */
-    link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+    link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
     link->irq.IRQInfo1 = IRQ_LEVEL_ID;
     link->irq.Handler = &netwave_interrupt;
     

index 1c216e0..f9bab5e 100644
@@ -120,7 +120,7 @@ orinoco_cs_probe(struct pcmcia_device *link)
 	link->priv = dev;
 
 	/* Interrupt setup */
-	link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+	link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
 	link->irq.IRQInfo1 = IRQ_LEVEL_ID;
 	link->irq.Handler = orinoco_interrupt;
 	link->irq.Instance = dev; 

index 963960d..44da0d1 100644
@@ -325,7 +325,7 @@ static int ray_probe(struct pcmcia_device *p_dev)
     p_dev->io.IOAddrLines = 5;
 
     /* Interrupt setup. For PCMCIA, driver takes what's given */
-    p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+    p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
     p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID;
     p_dev->irq.Handler = &ray_interrupt;
 

index 98df9bc..caf3e46 100644
@@ -593,7 +593,7 @@ spectrum_cs_probe(struct pcmcia_device *link)
 	link->priv = dev;
 
 	/* Interrupt setup */
-	link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+	link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
 	link->irq.IRQInfo1 = IRQ_LEVEL_ID;
 	link->irq.Handler = orinoco_interrupt;
 	link->irq.Instance = dev; 

index 00a3559..b5de38a 100644
@@ -4496,7 +4496,7 @@ wavelan_probe(struct pcmcia_device *p_dev)
   p_dev->io.IOAddrLines = 3;
 
   /* Interrupt setup */
-  p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+  p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
   p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID;
   p_dev->irq.Handler = wavelan_interrupt;
 

index 3771419..a546910 100644
@@ -1917,7 +1917,7 @@ static int wl3501_probe(struct pcmcia_device *p_dev)
 	p_dev->io.IOAddrLines	= 5;
 
 	/* Interrupt setup */
-	p_dev->irq.Attributes	= IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+	p_dev->irq.Attributes	= IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
 	p_dev->irq.IRQInfo1	= IRQ_LEVEL_ID;
 	p_dev->irq.Handler = wl3501_interrupt;
 

index bcf5792..3b330a0 100644
@@ -867,7 +867,7 @@ static int bluecard_probe(struct pcmcia_device *link)
 
 	link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
 	link->io.NumPorts1 = 8;
-	link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+	link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
 	link->irq.IRQInfo1 = IRQ_LEVEL_ID;
 
 	link->irq.Handler = bluecard_interrupt;

index 2705847..eddc379 100644
@@ -343,6 +343,7 @@ static irqreturn_t bt3c_interrupt(int irq, void *dev_inst)
 	bt3c_info_t *info = dev_inst;
 	unsigned int iobase;
 	int iir;
+	irqreturn_t r = IRQ_NONE;
 
 	BUG_ON(!info->hdev);
 

@@ -374,11 +375,12 @@ static irqreturn_t bt3c_interrupt(int irq, void *dev_inst)
 
 			outb(iir, iobase + CONTROL);
 		}
+		r = IRQ_HANDLED;
 	}
 
 	spin_unlock(&(info->lock));
 
-	return IRQ_HANDLED;
+	return r;
 }
 
 

@@ -657,7 +659,7 @@ static int bt3c_probe(struct pcmcia_device *link)
 
 	link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
 	link->io.NumPorts1 = 8;
-	link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+	link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
 	link->irq.IRQInfo1 = IRQ_LEVEL_ID;
 
 	link->irq.Handler = bt3c_interrupt;

index 68d1d25..1de13ed 100644
@@ -293,6 +293,7 @@ static irqreturn_t btuart_interrupt(int irq, void *dev_inst)
 	unsigned int iobase;
 	int boguscount = 0;
 	int iir, lsr;
+	irqreturn_t r = IRQ_NONE;
 
 	BUG_ON(!info->hdev);
 

@@ -302,6 +303,7 @@ static irqreturn_t btuart_interrupt(int irq, void *dev_inst)
 
 	iir = inb(iobase + UART_IIR) & UART_IIR_ID;
 	while (iir) {
+		r = IRQ_HANDLED;
 
 		/* Clear interrupt */
 		lsr = inb(iobase + UART_LSR);

@@ -335,7 +337,7 @@ static irqreturn_t btuart_interrupt(int irq, void *dev_inst)
 
 	spin_unlock(&(info->lock));
 
-	return IRQ_HANDLED;
+	return r;
 }
 
 

@@ -586,7 +588,7 @@ static int btuart_probe(struct pcmcia_device *link)
 
 	link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
 	link->io.NumPorts1 = 8;
-	link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+	link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
 	link->irq.IRQInfo1 = IRQ_LEVEL_ID;
 
 	link->irq.Handler = btuart_interrupt;

index dae45cd..9b7756b 100644
@@ -297,6 +297,7 @@ static irqreturn_t dtl1_interrupt(int irq, void *dev_inst)
 	unsigned char msr;
 	int boguscount = 0;
 	int iir, lsr;
+	irqreturn_t r = IRQ_NONE;
 
 	BUG_ON(!info->hdev);
 

@@ -307,6 +308,7 @@ static irqreturn_t dtl1_interrupt(int irq, void *dev_inst)
 	iir = inb(iobase + UART_IIR) & UART_IIR_ID;
 	while (iir) {
 
+		r = IRQ_HANDLED;
 		/* Clear interrupt */
 		lsr = inb(iobase + UART_LSR);
 

@@ -343,11 +345,12 @@ static irqreturn_t dtl1_interrupt(int irq, void *dev_inst)
 		info->ri_latch = msr & UART_MSR_RI;
 		clear_bit(XMIT_WAITING, &(info->tx_state));
 		dtl1_write_wakeup(info);
+		r = IRQ_HANDLED;
 	}
 
 	spin_unlock(&(info->lock));
 
-	return IRQ_HANDLED;
+	return r;
 }
 
 

@@ -568,7 +571,7 @@ static int dtl1_probe(struct pcmcia_device *link)
 
 	link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
 	link->io.NumPorts1 = 8;
-	link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+	link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
 	link->irq.IRQInfo1 = IRQ_LEVEL_ID;
 
 	link->irq.Handler = dtl1_interrupt;

index c240562..e580f30 100644
@@ -554,7 +554,7 @@ static int mgslpc_probe(struct pcmcia_device *link)
     /* Initialize the struct pcmcia_device structure */
 
     /* Interrupt setup */
-    link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
+    link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
     link->irq.IRQInfo1   = IRQ_LEVEL_ID;
     link->irq.Handler = NULL;
 

index 00e1d96..f89c2b7 100644
@@ -112,7 +112,7 @@ static int parport_probe(struct pcmcia_device *link)
 
     link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
     link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
-    link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
+    link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
     link->irq.IRQInfo1 = IRQ_LEVEL_ID;
     link->conf.Attributes = CONF_ENABLE_IRQ;
     link->conf.IntType = INT_MEMORY_AND_IO;

index 4884a18..8f1c3d4 100644
@@ -738,8 +738,9 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)
 	type = 0;
 	if (s->functions > 1)		/* All of this ought to be handled higher up */
 		type = IRQF_SHARED;
-	if (req->Attributes & IRQ_TYPE_DYNAMIC_SHARING)
+	else if (req->Attributes & IRQ_TYPE_DYNAMIC_SHARING)
 		type = IRQF_SHARED;
+	else printk(KERN_WARNING "pcmcia: Driver needs updating to support IRQ sharing.\n");
 
 #ifdef CONFIG_PCMCIA_PROBE
 

index 05a2810..d48a704 100644
@@ -150,7 +150,7 @@ static int ibwdt_set_heartbeat(int t)
 {
 	int i;
 
-	if ((t < 0) || (t > 30))
+	if ((t < 0) || (t >= 30))
 		return -EINVAL;
 
 	for (i = 0x0F; i > -1; i--)

index 55508b0..e241a93 100644
@@ -4136,7 +4136,7 @@ ahd_update_neg_table(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
 
 			/*
 			 * Harpoon2A assumed that there would be a
-			 * fallback rate between 160MHz and 80Mhz,
+			 * fallback rate between 160MHz and 80MHz,
 			 * so 7 is used as the period factor rather
 			 * than 8 for 160MHz.
 			 */

index c25b6ad..2eb99c8 100644
@@ -223,10 +223,10 @@ static const char *pci_bus_modes[] =
 	"PCI bus mode unknown",
 	"PCI bus mode unknown",
 	"PCI bus mode unknown",
-	"PCI-X 101-133Mhz",
-	"PCI-X 67-100Mhz",
-	"PCI-X 50-66Mhz",
-	"PCI 33 or 66Mhz"
+	"PCI-X 101-133MHz",
+	"PCI-X 67-100MHz",
+	"PCI-X 50-66MHz",
+	"PCI 33 or 66MHz"
 };
 
 #define		TESTMODE	0x00000800ul

index b085d64..963be64 100644
@@ -254,6 +254,8 @@ static int hfsplus_file_open(struct inode *inode, struct file *file)
 {
 	if (HFSPLUS_IS_RSRC(inode))
 		inode = HFSPLUS_I(inode).rsrc_inode;
+	if (!(file->f_flags & O_LARGEFILE) && i_size_read(inode) > MAX_NON_LFS)
+		return -EOVERFLOW;
 	atomic_inc(&HFSPLUS_I(inode).opencnt);
 	return 0;
 }

index 5c6a25c..d978c2e 100644
@@ -203,15 +203,8 @@ intel_dc21285_init(struct pci_dev *dev, struct map_pci_info *map)
 		 * not enabled, should we be allocating a new resource for it
 		 * or simply enabling it?
 		 */
-		if (!(pci_resource_flags(dev, PCI_ROM_RESOURCE) &
-				    IORESOURCE_ROM_ENABLE)) {
-		     	u32 val;
-			pci_resource_flags(dev, PCI_ROM_RESOURCE) |= IORESOURCE_ROM_ENABLE;
-			pci_read_config_dword(dev, PCI_ROM_ADDRESS, &val);
-			val |= PCI_ROM_ADDRESS_ENABLE;
-			pci_write_config_dword(dev, PCI_ROM_ADDRESS, val);
-			printk("%s: enabling expansion ROM\n", pci_name(dev));
-		}
+		pci_enable_rom(dev);
+		printk("%s: enabling expansion ROM\n", pci_name(dev));
 	}
 
 	if (!len || !base)

@@ -240,10 +233,7 @@ intel_dc21285_exit(struct pci_dev *dev, struct map_pci_info *map)
 	/*
 	 * We need to undo the PCI BAR2/PCI ROM BAR address alteration.
 	 */
-	pci_resource_flags(dev, PCI_ROM_RESOURCE) &= ~IORESOURCE_ROM_ENABLE;
-	pci_read_config_dword(dev, PCI_ROM_ADDRESS, &val);
-	val &= ~PCI_ROM_ADDRESS_ENABLE;
-	pci_write_config_dword(dev, PCI_ROM_ADDRESS, val);
+	pci_disable_rom(dev);
 }
 
 static unsigned long

index bd5c0e0..1f5f614 100644
@@ -21,7 +21,7 @@
  * between the ROM and other resources, so enabling it may disable access
  * to MMIO registers or other card memory.
  */
-static int pci_enable_rom(struct pci_dev *pdev)
+int pci_enable_rom(struct pci_dev *pdev)
 {
 	struct resource *res = pdev->resource + PCI_ROM_RESOURCE;
 	struct pci_bus_region region;

@@ -45,7 +45,7 @@ static int pci_enable_rom(struct pci_dev *pdev)
  * Disable ROM decoding on a PCI device by turning off the last bit in the
  * ROM BAR.
  */
-static void pci_disable_rom(struct pci_dev *pdev)
+void pci_disable_rom(struct pci_dev *pdev)
 {
 	u32 rom_addr;
 	pci_read_config_dword(pdev, pdev->rom_base_reg, &rom_addr);

@@ -260,3 +260,5 @@ void pci_cleanup_rom(struct pci_dev *pdev)
 
 EXPORT_SYMBOL(pci_map_rom);
 EXPORT_SYMBOL(pci_unmap_rom);
+EXPORT_SYMBOL_GPL(pci_enable_rom);
+EXPORT_SYMBOL_GPL(pci_disable_rom);

index 98dc624..acf8f24 100644
@@ -631,6 +631,8 @@ int __must_check pci_assign_resource(struct pci_dev *dev, int i);
 int pci_select_bars(struct pci_dev *dev, unsigned long flags);
 
 /* ROM control related routines */
+int pci_enable_rom(struct pci_dev *pdev);
+void pci_disable_rom(struct pci_dev *pdev);
 void __iomem __must_check *pci_map_rom(struct pci_dev *pdev, size_t *size);
 void pci_unmap_rom(struct pci_dev *pdev, void __iomem *rom);
 size_t pci_get_rom_size(void __iomem *rom, size_t size);

index ee89ddd..cabc84b 100644
@@ -134,7 +134,6 @@ int
 qla2100_pci_config(scsi_qla_host_t *ha)
 {
 	uint16_t w;
-	uint32_t d;
 	unsigned long flags;
 	struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
 

@@ -146,9 +145,7 @@ qla2100_pci_config(scsi_qla_host_t *ha)
 	pci_write_config_word(ha->pdev, PCI_COMMAND, w);
 
 	/* Reset expansion ROM address decode enable */
-	pci_read_config_dword(ha->pdev, PCI_ROM_ADDRESS, &d);
-	d &= ~PCI_ROM_ADDRESS_ENABLE;
-	pci_write_config_dword(ha->pdev, PCI_ROM_ADDRESS, d);
+	pci_disable_rom(ha->pdev);
 
 	/* Get PCI bus information. */
 	spin_lock_irqsave(&ha->hardware_lock, flags);

@@ -168,7 +165,6 @@ int
 qla2300_pci_config(scsi_qla_host_t *ha)
 {
 	uint16_t	w;
-	uint32_t	d;
 	unsigned long   flags = 0;
 	uint32_t	cnt;
 	struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;

@@ -231,9 +227,7 @@ qla2300_pci_config(scsi_qla_host_t *ha)
 	pci_write_config_byte(ha->pdev, PCI_LATENCY_TIMER, 0x80);
 
 	/* Reset expansion ROM address decode enable */
-	pci_read_config_dword(ha->pdev, PCI_ROM_ADDRESS, &d);
-	d &= ~PCI_ROM_ADDRESS_ENABLE;
-	pci_write_config_dword(ha->pdev, PCI_ROM_ADDRESS, d);
+	pci_disable_rom(ha->pdev);
 
 	/* Get PCI bus information. */
 	spin_lock_irqsave(&ha->hardware_lock, flags);

@@ -253,7 +247,6 @@ int
 qla24xx_pci_config(scsi_qla_host_t *ha)
 {
 	uint16_t w;
-	uint32_t d;
 	unsigned long flags = 0;
 	struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
 

@@ -276,9 +269,7 @@ qla24xx_pci_config(scsi_qla_host_t *ha)
 		pcie_set_readrq(ha->pdev, 2048);
 
 	/* Reset expansion ROM address decode enable */
-	pci_read_config_dword(ha->pdev, PCI_ROM_ADDRESS, &d);
-	d &= ~PCI_ROM_ADDRESS_ENABLE;
-	pci_write_config_dword(ha->pdev, PCI_ROM_ADDRESS, d);
+	pci_disable_rom(ha->pdev);
 
 	ha->chip_revision = ha->pdev->revision;
 

@@ -300,7 +291,6 @@ int
 qla25xx_pci_config(scsi_qla_host_t *ha)
 {
 	uint16_t w;
-	uint32_t d;
 
 	pci_set_master(ha->pdev);
 	pci_try_set_mwi(ha->pdev);

@@ -315,9 +305,7 @@ qla25xx_pci_config(scsi_qla_host_t *ha)
 		pcie_set_readrq(ha->pdev, 2048);
 
 	/* Reset expansion ROM address decode enable */
-	pci_read_config_dword(ha->pdev, PCI_ROM_ADDRESS, &d);
-	d &= ~PCI_ROM_ADDRESS_ENABLE;
-	pci_write_config_dword(ha->pdev, PCI_ROM_ADDRESS, d);
+	pci_disable_rom(ha->pdev);
 
 	ha->chip_revision = ha->pdev->revision;
 

index 821d0ed..c11f398 100644
@@ -19,6 +19,7 @@ static int maprom_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
 static int maprom_write (struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
 static void maprom_nop (struct mtd_info *);
 static struct mtd_info *map_rom_probe(struct map_info *map);
+static void maprom_erase (struct mtd_info *mtd, struct erase_info *info);
 
 static struct mtd_chip_driver maprom_chipdrv = {
 	.probe	= map_rom_probe,

@@ -42,6 +43,7 @@ static struct mtd_info *map_rom_probe(struct map_info *map)
 	mtd->read = maprom_read;
 	mtd->write = maprom_write;
 	mtd->sync = maprom_nop;
+	mtd->erase = maprom_erase;
 	mtd->flags = MTD_CAP_ROM;
 	mtd->erasesize = map->size;
 	mtd->writesize = 1;

@@ -71,6 +73,11 @@ static int maprom_write (struct mtd_info *mtd, loff_t to, size_t len, size_t *re
 	return -EIO;
 }
 
+static void maprom_erase (struct mtd_info *mtd, struct erase_info *info)
+{
+	/* We do our best 8) */
+}
+
 static int __init map_rom_init(void)
 {
 	register_mtd_chip_driver(&maprom_chipdrv);

index c11f398..8fb3280 100644
@@ -19,7 +19,7 @@ static int maprom_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
 static int maprom_write (struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
 static void maprom_nop (struct mtd_info *);
 static struct mtd_info *map_rom_probe(struct map_info *map);
-static void maprom_erase (struct mtd_info *mtd, struct erase_info *info);
+static int maprom_erase (struct mtd_info *mtd, struct erase_info *info);
 
 static struct mtd_chip_driver maprom_chipdrv = {
 	.probe	= map_rom_probe,

@@ -73,9 +73,10 @@ static int maprom_write (struct mtd_info *mtd, loff_t to, size_t len, size_t *re
 	return -EIO;
 }
 
-static void maprom_erase (struct mtd_info *mtd, struct erase_info *info)
+static int maprom_erase (struct mtd_info *mtd, struct erase_info *info)
 {
 	/* We do our best 8) */
+	return -EIO;
 }
 
 static int __init map_rom_init(void)

index a1abf95..603ffd0 100644
@@ -77,12 +77,6 @@ MODULE_VERSION(my_VERSION);
  *  Fusion MPT LAN private structures
  */
 
-struct NAA_Hosed {
-	u16 NAA;
-	u8 ieee[FC_ALEN];
-	struct NAA_Hosed *next;
-};
-
 struct BufferControl {
 	struct sk_buff	*skb;
 	dma_addr_t	dma;

@@ -159,11 +153,6 @@ static u8 LanCtx = MPT_MAX_PROTOCOL_DRIVERS;
 static u32 max_buckets_out = 127;
 static u32 tx_max_out_p = 127 - 16;
 
-#ifdef QLOGIC_NAA_WORKAROUND
-static struct NAA_Hosed *mpt_bad_naa = NULL;
-DEFINE_RWLOCK(bad_naa_lock);
-#endif
-
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /**
  *	lan_reply - Handle all data sent from the hardware.

@@ -780,30 +769,6 @@ mpt_lan_sdu_send (struct sk_buff *skb, struct net_device *dev)
 //			ctx, skb, skb->data));
 
 	mac = skb_mac_header(skb);
-#ifdef QLOGIC_NAA_WORKAROUND
-{
-	struct NAA_Hosed *nh;
-
-	/* Munge the NAA for Tx packets to QLogic boards, which don't follow
-	   RFC 2625. The longer I look at this, the more my opinion of Qlogic
-	   drops. */
-	read_lock_irq(&bad_naa_lock);
-	for (nh = mpt_bad_naa; nh != NULL; nh=nh->next) {
-		if ((nh->ieee[0] == mac[0]) &&
-		    (nh->ieee[1] == mac[1]) &&
-		    (nh->ieee[2] == mac[2]) &&
-		    (nh->ieee[3] == mac[3]) &&
-		    (nh->ieee[4] == mac[4]) &&
-		    (nh->ieee[5] == mac[5])) {
-			cur_naa = nh->NAA;
-			dlprintk ((KERN_INFO "mptlan/sdu_send: using NAA value "
-				  "= %04x.\n", cur_naa));
-			break;
-		}
-	}
-	read_unlock_irq(&bad_naa_lock);
-}
-#endif
 
 	pTrans->TransactionDetails[0] = cpu_to_le32((cur_naa         << 16) |
 						    (mac[0] <<  8) |

@@ -1572,79 +1537,6 @@ mpt_lan_type_trans(struct sk_buff *skb, struct net_device *dev)
 
 	fcllc = (struct fcllc *)skb->data;
 
-#ifdef QLOGIC_NAA_WORKAROUND
-{
-	u16 source_naa = fch->stype, found = 0;
-
-	/* Workaround for QLogic not following RFC 2625 in regards to the NAA
-	   value. */
-
-	if ((source_naa & 0xF000) == 0)
-		source_naa = swab16(source_naa);
-
-	if (fcllc->ethertype == htons(ETH_P_ARP))
-	    dlprintk ((KERN_INFO "mptlan/type_trans: got arp req/rep w/ naa of "
-		      "%04x.\n", source_naa));
-
-	if ((fcllc->ethertype == htons(ETH_P_ARP)) &&
-	   ((source_naa >> 12) !=  MPT_LAN_NAA_RFC2625)){
-		struct NAA_Hosed *nh, *prevnh;
-		int i;
-
-		dlprintk ((KERN_INFO "mptlan/type_trans: ARP Req/Rep from "
-			  "system with non-RFC 2625 NAA value (%04x).\n",
-			  source_naa));
-
-		write_lock_irq(&bad_naa_lock);
-		for (prevnh = nh = mpt_bad_naa; nh != NULL;
-		     prevnh=nh, nh=nh->next) {
-			if ((nh->ieee[0] == fch->saddr[0]) &&
-			    (nh->ieee[1] == fch->saddr[1]) &&
-			    (nh->ieee[2] == fch->saddr[2]) &&
-			    (nh->ieee[3] == fch->saddr[3]) &&
-			    (nh->ieee[4] == fch->saddr[4]) &&
-			    (nh->ieee[5] == fch->saddr[5])) {
-				found = 1;
-				dlprintk ((KERN_INFO "mptlan/type_trans: ARP Re"
-					 "q/Rep w/ bad NAA from system already"
-					 " in DB.\n"));
-				break;
-			}
-		}
-
-		if ((!found) && (nh == NULL)) {
-
-			nh = kmalloc(sizeof(struct NAA_Hosed), GFP_KERNEL);
-			dlprintk ((KERN_INFO "mptlan/type_trans: ARP Req/Rep w/"
-				 " bad NAA from system not yet in DB.\n"));
-
-			if (nh != NULL) {
-				nh->next = NULL;
-				if (!mpt_bad_naa)
-					mpt_bad_naa = nh;
-				if (prevnh)
-					prevnh->next = nh;
-
-				nh->NAA = source_naa; /* Set the S_NAA value. */
-				for (i = 0; i < FC_ALEN; i++)
-					nh->ieee[i] = fch->saddr[i];
-				dlprintk ((KERN_INFO "Got ARP from %02x:%02x:%02x:%02x:"
-					  "%02x:%02x with non-compliant S_NAA value.\n",
-					  fch->saddr[0], fch->saddr[1], fch->saddr[2],
-					  fch->saddr[3], fch->saddr[4],fch->saddr[5]));
-			} else {
-				printk (KERN_ERR "mptlan/type_trans: Unable to"
-					" kmalloc a NAA_Hosed struct.\n");
-			}
-		} else if (!found) {
-			printk (KERN_ERR "mptlan/type_trans: found not"
-				" set, but nh isn't null. Evil "
-				"funkiness abounds.\n");
-		}
-		write_unlock_irq(&bad_naa_lock);
-	}
-}
-#endif
 
 	/* Strip the SNAP header from ARP packets since we don't
 	 * pass them through to the 802.2/SNAP layers.

index 7cbc78a..016c781 100644
@@ -651,8 +651,10 @@ pxa_ep_alloc_request(struct usb_ep *_ep, gfp_t gfp_flags)
 	struct pxa27x_request *req;
 
 	req = kzalloc(sizeof *req, gfp_flags);
-	if (!req || !_ep)
+	if (!req || !_ep) {
+		kfree(req);
 		return NULL;
+	}
 
 	INIT_LIST_HEAD(&req->queue);
 	req->in_use = 0;

index c2f2393..c014ffb 100644
@@ -2041,9 +2041,9 @@ static int pciserial_resume_one(struct pci_dev *dev)
 		 * The device may have been disabled.  Re-enable it.
 		 */
 		err = pci_enable_device(dev);
+		/* FIXME: We cannot simply error out here */
 		if (err)
-			return err;
-
+			printk(KERN_ERR "pciserial: Unable to re-enable ports, trying to continue.\n");
 		pciserial_resume_ports(priv);
 	}
 	return 0;

index a8a62bb..0750dcb 100644
@@ -614,7 +614,10 @@ parport_register_device(struct parport *port, const char *name,
 	 * pardevice fields. -arca
 	 */
 	port->ops->init_state(tmp, tmp->state);
-	parport_device_proc_register(tmp);
+	if (test_and_set_bit(PARPORT_DEVPROC_REGISTERED, &port->devflags)) {
+		port->proc_device = tmp;
+		parport_device_proc_register(tmp);
+	}
 	return tmp;
 
  out_free_all:

@@ -646,10 +649,14 @@ void parport_unregister_device(struct pardevice *dev)
 	}
 #endif
 
-	parport_device_proc_unregister(dev);
-
 	port = dev->port->physport;
 
+	if (port->proc_device == dev) {
+		port->proc_device = NULL;
+		clear_bit(PARPORT_DEVPROC_REGISTERED, &port->devflags);
+		parport_device_proc_unregister(dev);
+	}
+
 	if (port->cad == dev) {
 		printk(KERN_DEBUG "%s: %s forgot to release port\n",
 		       port->name, dev->name);

index 6a0d7cd..986252e 100644
@@ -326,6 +326,10 @@ struct parport {
 	int spintime;
 	atomic_t ref_count;
 
+	unsigned long devflags;
+#define PARPORT_DEVPROC_REGISTERED	0
+	struct pardevice *proc_device;	/* Currently register proc device */
+
 	struct list_head full_list;
 	struct parport *slaves[3];
 };

index 929e5c9..3b1d9ef 100644
@@ -6,7 +6,7 @@
  *  Copyright (c) 2001, 2002  Hitoshi Yamamoto
  *
  *  Taken from i386 version.
- *    (c) 1995 Alan Cox, Building #3 <[email protected]>
+ *    (c) 1995 Alan Cox, Building #3 <[email protected]>
  *    (c) 1998-99, 2000 Ingo Molnar <[email protected]>
  *
  *  This code is released under the GNU General Public License version 2 or

index 2c03ac1..e5b6627 100644
@@ -7,7 +7,7 @@
  *  Copyright (c) 2001, 2002, 2003  Hitoshi Yamamoto
  *
  *  Taken from i386 version.
- *	  (c) 1995 Alan Cox, Building #3 <[email protected]>
+ *	  (c) 1995 Alan Cox, Building #3 <[email protected]>
  *	  (c) 1998, 1999, 2000 Ingo Molnar <[email protected]>
  *
  *	Much of the core SMP work is based on previous work by Thomas Radke, to

index d332503..2d4183c 100644
@@ -2,8 +2,7 @@
  *
  *	SoftDog	0.05:	A Software Watchdog Device
  *
- *	(c) Copyright 1996 Alan Cox <[email protected]>, All Rights Reserved.
- *				http://www.redhat.com
+ *	(c) Copyright 1996 Alan Cox <[email protected]>, All Rights Reserved.
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License

index 732d1f4..dcc56fd 100644
@@ -160,9 +160,9 @@
  *         Work around byte swap bug in one of the Vaio's BIOS's
  *         (Marc Boucher <[email protected]>).
  *         Exposed the disable flag to dmi so that we can handle known
- *         broken APM (Alan Cox <[email protected]>).
+ *         broken APM (Alan Cox <[email protected]>).
  *   1.14ac: If the BIOS says "I slowed the CPU down" then don't spin
- *         calling it - instead idle. (Alan Cox <[email protected]>)
+ *         calling it - instead idle. (Alan Cox <[email protected]>)
  *         If an APM idle fails log it and idle sensibly
  *   1.15: Don't queue events to clients who open the device O_WRONLY.
  *         Don't expect replies from clients who open the device O_RDONLY.

index 774d87c..5307ab6 100644
@@ -1,6 +1,6 @@
 /*
  * mce.c - x86 Machine Check Exception Reporting
- * (c) 2002 Alan Cox <[email protected]>, Dave Jones <[email protected]>
+ * (c) 2002 Alan Cox <[email protected]>, Dave Jones <[email protected]>
  */
 
 #include <linux/init.h>

index bfa5817..c9f77ea 100644
@@ -1,6 +1,6 @@
 /*
  * P5 specific Machine Check Exception Reporting
- * (C) Copyright 2002 Alan Cox <[email protected]>
+ * (C) Copyright 2002 Alan Cox <[email protected]>
  */
 
 #include <linux/init.h>

index 62efc9c..2ac52d7 100644
@@ -1,6 +1,6 @@
 /*
  * P6 specific Machine Check Exception Reporting
- * (C) Copyright 2002 Alan Cox <[email protected]>
+ * (C) Copyright 2002 Alan Cox <[email protected]>
  */
 
 #include <linux/init.h>

index f2be3e1..2a043d8 100644
@@ -1,6 +1,6 @@
 /*
  * IDT Winchip specific Machine Check Exception Reporting
- * (C) Copyright 2002 Alan Cox <[email protected]>
+ * (C) Copyright 2002 Alan Cox <[email protected]>
  */
 
 #include <linux/init.h>

index b3fb430..3c22a5e 100644
@@ -2,7 +2,7 @@
  *	Intel Multiprocessor Specification 1.1 and 1.4
  *	compliant MP-table parsing routines.
  *
- *	(c) 1995 Alan Cox, Building #3 <[email protected]>
+ *	(c) 1995 Alan Cox, Building #3 <[email protected]>
  *	(c) 1998, 1999, 2000 Ingo Molnar <[email protected]>
  *      (c) 2008 Alexey Starikovskiy <[email protected]>
  */

index 361b7a4..d057d80 100644
@@ -1,7 +1,7 @@
 /*
  *	Intel SMP support routines.
  *
- *	(c) 1995 Alan Cox, Building #3 <[email protected]>
+ *	(c) 1995 Alan Cox, Building #3 <[email protected]>
  *	(c) 1998-99, 2000 Ingo Molnar <[email protected]>
  *      (c) 2002,2003 Andi Kleen, SuSE Labs.
  *

index 7985c5b..9f23618 100644
@@ -1,7 +1,7 @@
 /*
  *	x86 SMP booting functions
  *
- *	(c) 1995 Alan Cox, Building #3 <[email protected]>
+ *	(c) 1995 Alan Cox, Building #3 <[email protected]>
  *	(c) 1998, 1999, 2000 Ingo Molnar <[email protected]>
  *	Copyright 2001 Andi Kleen, SuSE Labs.
  *

index 75a406f..5c33767 100644
@@ -1,6 +1,6 @@
 /*
  *  ata_generic.c - Generic PATA/SATA controller driver.
- *  Copyright 2005 Red Hat Inc <[email protected]>, all rights reserved.
+ *  Copyright 2005 Red Hat Inc, all rights reserved.
  *
  *  Elements from ide/pci/generic.c
  *	    Copyright (C) 2001-2002	Andre Hedrick <[email protected]>

index e6b4606..5b4f465 100644
@@ -14,7 +14,7 @@
  *
  *  Copyright (C) 1998-1999 Andrzej Krzysztofowicz, Author and Maintainer
  *  Copyright (C) 1998-2000 Andre Hedrick <[email protected]>
- *  Copyright (C) 2003 Red Hat Inc <[email protected]>
+ *  Copyright (C) 2003 Red Hat Inc
  *
  *
  *  This program is free software; you can redistribute it and/or modify

index eb919c1..e2e332d 100644
@@ -1,7 +1,7 @@
 /*
  *	ACPI PATA driver
  *
- *	(c) 2007 Red Hat  <[email protected]>
+ *	(c) 2007 Red Hat
  */
 
 #include <linux/kernel.h>

index 5ca70fa..73c466e 100644
@@ -1,7 +1,6 @@
 /*
  * pata_ali.c 	- ALI 15x3 PATA for new ATA layer
  *			  (C) 2005 Red Hat Inc
- *			  Alan Cox <[email protected]>
  *
  * based in part upon
  * linux/drivers/ide/pci/alim15x3.c		Version 0.17	2003/01/02

index 57dd00f..0ec9c7d 100644
@@ -1,7 +1,6 @@
 /*
  * pata_amd.c 	- AMD PATA for new ATA layer
  *			  (C) 2005-2006 Red Hat Inc
- *			  Alan Cox <[email protected]>
  *
  *  Based on pata-sil680. Errata information is taken from data sheets
  *  and the amd74xx.c driver by Vojtech Pavlik. Nvidia SATA devices are

index 0f513bc..6b3092c 100644
@@ -1,7 +1,7 @@
 /*
  *    pata_artop.c - ARTOP ATA controller driver
  *
- *	(C) 2006 Red Hat <[email protected]>
+ *	(C) 2006 Red Hat
  *	(C) 2007 Bartlomiej Zolnierkiewicz
  *
  *    Based in part on drivers/ide/pci/aec62xx.c

index e8a0d99..0e2cde8 100644
@@ -1,7 +1,6 @@
 /*
  * pata_atiixp.c 	- ATI PATA for new ATA layer
  *			  (C) 2005 Red Hat Inc
- *			  Alan Cox <[email protected]>
  *
  * Based on
  *

index 2de30b9..34a3942 100644
@@ -1,7 +1,6 @@
 /*
  * pata_cmd640.c 	- CMD640 PCI PATA for new ATA layer
  *			  (C) 2007 Red Hat Inc
- *			  Alan Cox <[email protected]>
  *
  * Based upon
  *  linux/drivers/ide/pci/cmd640.c		Version 1.02  Sep 01, 1996

index ddd09b7..3167d8f 100644
@@ -1,7 +1,7 @@
 /*
  * pata_cmd64x.c 	- CMD64x PATA for new ATA layer
  *			  (C) 2005 Red Hat Inc
- *			  Alan Cox <[email protected]>
+ *			  Alan Cox <[email protected]>
  *
  * Based upon
  * linux/drivers/ide/pci/cmd64x.c		Version 1.30	Sept 10, 2002

index 0c4b271..bba4533 100644
@@ -1,7 +1,6 @@
 /*
  * pata-cs5530.c 	- CS5530 PATA for new ATA layer
  *			  (C) 2005 Red Hat Inc
- *			  Alan Cox <[email protected]>
  *
  * based upon cs5530.c by Mark Lord.
  *

index f1b6556..1b2d4a0 100644
@@ -1,7 +1,7 @@
 /*
  * pata-cs5535.c 	- CS5535 PATA for new ATA layer
  *			  (C) 2005-2006 Red Hat Inc
- *			  Alan Cox <[email protected]>
+ *			  Alan Cox <[email protected]>
  *
  * based upon cs5535.c from AMD <[email protected]> as cleaned up and
  * made readable and Linux style by Wolfgang Zuleger <[email protected]

index 2ff6260..d546425 100644
@@ -1,7 +1,7 @@
 /*
  * pata_cypress.c 	- Cypress PATA for new ATA layer
  *			  (C) 2006 Red Hat Inc
- *			  Alan Cox <[email protected]>
+ *			  Alan Cox
  *
  * Based heavily on
  * linux/drivers/ide/pci/cy82c693.c		Version 0.40	Sep. 10, 2002

index 9fba829..ac6392e 100644
@@ -1,7 +1,7 @@
 /*
  *    pata_efar.c - EFAR PIIX clone controller driver
  *
- *	(C) 2005 Red Hat <[email protected]>
+ *	(C) 2005 Red Hat
  *
  *    Some parts based on ata_piix.c by Jeff Garzik and others.
  *

index 6a111ba..15cdb91 100644
@@ -1,7 +1,7 @@
 
 /*
  *   pata-isapnp.c - ISA PnP PATA controller driver.
- *   Copyright 2005/2006 Red Hat Inc <[email protected]>, all rights reserved.
+ *   Copyright 2005/2006 Red Hat Inc, all rights reserved.
  *
  *   Based in part on ide-pnp.c by Andrey Panin <[email protected]>
  */

index 0221c9a..4e13aad 100644
@@ -1,7 +1,7 @@
 /*
  * pata_it821x.c 	- IT821x PATA for new ATA layer
  *			  (C) 2005 Red Hat Inc
- *			  Alan Cox <[email protected]>
+ *			  Alan Cox <[email protected]>
  *			  (C) 2007 Bartlomiej Zolnierkiewicz
  *
  * based upon

@@ -10,7 +10,7 @@
  *
  * linux/drivers/ide/pci/it821x.c		Version 0.09	December 2004
  *
- * Copyright (C) 2004		Red Hat <[email protected]>
+ * Copyright (C) 2004		Red Hat
  *
  *  May be copied or modified under the terms of the GNU General Public License
  *  Based in part on the ITE vendor provided SCSI driver.

index 73b7596..38cf1ab 100644
@@ -4,7 +4,7 @@
  *			driven by AHCI in the usual configuration although
  *			this driver can handle other setups if we need it.
  *
- *	(c) 2006 Red Hat  <[email protected]>
+ *	(c) 2006 Red Hat
  */
 
 #include <linux/kernel.h>

index bc037ff..930c220 100644
@@ -1,6 +1,6 @@
 /*
  *   pata-legacy.c - Legacy port PATA/SATA controller driver.
- *   Copyright 2005/2006 Red Hat <[email protected]>, all rights reserved.
+ *   Copyright 2005/2006 Red Hat, all rights reserved.
  *
  *  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

index 0d87eec..76e399b 100644
@@ -5,7 +5,7 @@
  *	isn't making full use of the device functionality but it is
  *	easy to get working.
  *
- *	(c) 2006 Red Hat  <[email protected]>
+ *	(c) 2006 Red Hat
  */
 
 #include <linux/kernel.h>

index 7d7e3fd..7c8faa4 100644
@@ -1,7 +1,7 @@
 /*
  * pata_mpiix.c 	- Intel MPIIX PATA for new ATA layer
  *			  (C) 2005-2006 Red Hat Inc
- *			  Alan Cox <[email protected]>
+ *			  Alan Cox <[email protected]>
  *
  * The MPIIX is different enough to the PIIX4 and friends that we give it
  * a separate driver. The old ide/pci code handles this by just not tuning

index d9719c8..9dc05e1 100644
@@ -1,7 +1,7 @@
 /*
  *    pata_netcell.c - Netcell PATA driver
  *
- *	(c) 2006 Red Hat  <[email protected]>
+ *	(c) 2006 Red Hat
  */
 
 #include <linux/kernel.h>

index 565e67c..5e76f96 100644
@@ -1,7 +1,6 @@
 /*
  * pata_ninja32.c 	- Ninja32 PATA for new ATA layer
  *			  (C) 2007 Red Hat Inc
- *			  Alan Cox <[email protected]>
  *
  * Note: The controller like many controllers has shared timings for
  * PIO and DMA. We thus flip to the DMA timings in dma_start and flip back

index be756b7..40d411c 100644
@@ -1,7 +1,6 @@
 /*
  * pata_ns87410.c 	- National Semiconductor 87410 PATA for new ATA layer
  *			  (C) 2006 Red Hat Inc
- *			  Alan Cox <[email protected]>
  *
  *  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

index e0aa7ea..89bf5f8 100644
@@ -1,7 +1,7 @@
 /*
  *    pata_ns87415.c - NS87415 (non PARISC) PATA
  *
- *	(C) 2005 Red Hat <[email protected]>
+ *	(C) 2005 Red Hat <[email protected]>
  *
  *    This is a fairly generic MWDMA controller. It has some limitations
  *    as it requires timing reloads on PIO/DMA transitions but it is otherwise

index df64f24..c0dbc46 100644
@@ -1,7 +1,7 @@
 /*
  *    pata_oldpiix.c - Intel PATA/SATA controllers
  *
- *	(C) 2005 Red Hat <[email protected]>
+ *	(C) 2005 Red Hat
  *
  *    Some parts based on ata_piix.c by Jeff Garzik and others.
  *

index fb2cf66..e4fa4d5 100644
@@ -1,7 +1,6 @@
 /*
  * pata_opti.c 	- ATI PATA for new ATA layer
  *			  (C) 2005 Red Hat Inc
- *			  Alan Cox <[email protected]>
  *
  * Based on
  *  linux/drivers/ide/pci/opti621.c		Version 0.7	Sept 10, 2002

index 4cd7444..93bb6e9 100644
@@ -1,7 +1,6 @@
 /*
  * pata_optidma.c 	- Opti DMA PATA for new ATA layer
  *			  (C) 2006 Red Hat Inc
- *			  Alan Cox <[email protected]>
  *
  *	The Opti DMA controllers are related to the older PIO PCI controllers
  *	and indeed the VLB ones. The main differences are that the timing

index 41b4361..d3f2c0d 100644
@@ -1,6 +1,6 @@
 /*
  *   pata_pcmcia.c - PCMCIA PATA controller driver.
- *   Copyright 2005-2006 Red Hat Inc <[email protected]>, all rights reserved.
+ *   Copyright 2005-2006 Red Hat Inc, all rights reserved.
  *   PCMCIA ident update Copyright 2006 Marcin Juszkiewicz
  *						<[email protected]>
  *

index d267306..799a6a0 100644
@@ -1,7 +1,7 @@
 /*
  * pata_pdc202xx_old.c 	- Promise PDC202xx PATA for new ATA layer
  *			  (C) 2005 Red Hat Inc
- *			  Alan Cox <[email protected]>
+ *			  Alan Cox <[email protected]>
  *			  (C) 2007 Bartlomiej Zolnierkiewicz
  *
  * Based in part on linux/drivers/ide/pci/pdc202xx_old.c

index 8f65ad6..77e4e3b 100644
@@ -5,7 +5,7 @@
  *
  * Based on pata_pcmcia:
  *
- *   Copyright 2005-2006 Red Hat Inc <[email protected]>, all rights reserved.
+ *   Copyright 2005-2006 Red Hat Inc, all rights reserved.
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive

index 63b7a1c..3080f37 100644
@@ -1,6 +1,6 @@
 /*
  *    pata_qdi.c - QDI VLB ATA controllers
- *	(C) 2006 Red Hat <[email protected]>
+ *	(C) 2006 Red Hat
  *
  * This driver mostly exists as a proof of concept for non PCI devices under
  * libata. While the QDI6580 was 'neat' in 1993 it is no longer terribly

index 1c0d9fa..0b0aa45 100644
@@ -1,7 +1,7 @@
 /*
  *    pata_radisys.c - Intel PATA/SATA controllers
  *
- *	(C) 2006 Red Hat <[email protected]>
+ *	(C) 2006 Red Hat <[email protected]>
  *
  *    Some parts based on ata_piix.c by Jeff Garzik and others.
  *

index 0278fd2..9a4bdca 100644
@@ -1,5 +1,5 @@
 /*
- * New ATA layer SC1200 driver		Alan Cox <[email protected]>
+ * New ATA layer SC1200 driver		Alan Cox <[email protected]>
  *
  * TODO: Mode selection filtering
  * TODO: Can't enable second channel until ATA core has serialize

index 16673d1..cf3707e 100644
@@ -8,7 +8,7 @@
  *  Copyright 2003-2005 Jeff Garzik
  *  Copyright (C) 1998-1999 Andrzej Krzysztofowicz, Author and Maintainer
  *  Copyright (C) 1998-2000 Andre Hedrick <[email protected]>
- *  Copyright (C) 2003 Red Hat Inc <[email protected]>
+ *  Copyright (C) 2003 Red Hat Inc
  *
  * and drivers/ata/ahci.c:
  *  Copyright 2004-2005 Red Hat, Inc.

index ffd26d0..72e41c9 100644
@@ -1,7 +1,6 @@
 /*
  * pata_serverworks.c 	- Serverworks PATA for new ATA layer
  *			  (C) 2005 Red Hat Inc
- *			  Alan Cox <[email protected]>
  *
  * based upon
  *

index e970b22..d3cffef 100644
@@ -1,7 +1,6 @@
 /*
  * pata_sil680.c 	- SIL680 PATA for new ATA layer
  *			  (C) 2005 Red Hat Inc
- *			  Alan Cox <[email protected]>
  *
  * based upon
  *

index 26345d7..d342366 100644
@@ -1,7 +1,7 @@
 /*
  *    pata_sis.c - SiS ATA driver
  *
- *	(C) 2005 Red Hat <[email protected]>
+ *	(C) 2005 Red Hat
  *	(C) 2007 Bartlomiej Zolnierkiewicz
  *
  *    Based upon linux/drivers/ide/pci/sis5513.c

index 69877bd..1b0e7b6 100644
@@ -1,7 +1,6 @@
 /*
  * pata_sl82c105.c 	- SL82C105 PATA for new ATA layer
  *			  (C) 2005 Red Hat Inc
- *			  Alan Cox <[email protected]>
  *
  * Based in part on linux/drivers/ide/pci/sl82c105.c
  * 		SL82C105/Winbond 553 IDE driver

index b181261..ef95975 100644
@@ -1,7 +1,7 @@
 /*
  * pata_triflex.c 	- Compaq PATA for new ATA layer
  *			  (C) 2005 Red Hat Inc
- *			  Alan Cox <[email protected]>
+ *			  Alan Cox <[email protected]>
  *
  * based upon
  *

index 8fdb2ce..681169c 100644
@@ -1,7 +1,6 @@
 /*
  * pata_via.c 	- VIA PATA for new ATA layer
  *			  (C) 2005-2006 Red Hat Inc
- *			  Alan Cox <[email protected]>
  *
  *  Documentation
  *	Most chipset documentation available under NDA only

index a7606b0..319e164 100644
@@ -1,6 +1,6 @@
 /*
  *    pata_winbond.c - Winbond VLB ATA controllers
- *	(C) 2006 Red Hat <[email protected]>
+ *	(C) 2006 Red Hat
  *
  *    Support for the Winbond 83759A when operating in advanced mode.
  *    Multichip mode is not currently supported.

index c422e87..cd0ba51 100644
@@ -11,7 +11,7 @@
  * derived from
  *
  * Hardware driver for the AMD 768 Random Number Generator (RNG)
- * (c) Copyright 2001 Red Hat Inc <[email protected]>
+ * (c) Copyright 2001 Red Hat Inc
  *
  * derived from
  *

index fed4ef5..64d513f 100644
@@ -11,7 +11,7 @@
  * derived from
  *
  * Hardware driver for the AMD 768 Random Number Generator (RNG)
- * (c) Copyright 2001 Red Hat Inc <[email protected]>
+ * (c) Copyright 2001 Red Hat Inc
  *
  * derived from
  *

index 8a2fce0..5dcbe60 100644
@@ -11,7 +11,7 @@
  * derived from
  *
  * Hardware driver for the AMD 768 Random Number Generator (RNG)
- * (c) Copyright 2001 Red Hat Inc <[email protected]>
+ * (c) Copyright 2001 Red Hat Inc
  *
  * derived from
  *

index 128202e..4e9573c 100644
@@ -11,7 +11,7 @@
  * derived from
  *
  * Hardware driver for the AMD 768 Random Number Generator (RNG)
- * (c) Copyright 2001 Red Hat Inc <[email protected]>
+ * (c) Copyright 2001 Red Hat Inc
  *
  * derived from
  *

index 7d30ee1..04e4549 100644
@@ -7,12 +7,14 @@
  *	Original driver code supplied by Multi-Tech
  *
  *	Changes
- *	1/9/98	[email protected]		Merge to 2.0.x kernel tree
+ *	1/9/98	[email protected]
+ *					Merge to 2.0.x kernel tree
  *					Obtain and use official major/minors
  *					Loader switched to a misc device
  *					(fixed range check bug as a side effect)
  *					Printk clean up
- *	9/12/98	[email protected]		Rough port to 2.1.x
+ *	9/12/98	[email protected]
+ *					Rough port to 2.1.x
  *
  *	10/6/99 sameer			Merged the ISA and PCI drivers to
  *					a new unified driver.

index 8beef50..0477669 100644
@@ -14,7 +14,8 @@
  *      (at your option) any later version.
  *
  *	Fed through a cleanup, indent and remove of non 2.6 code by Alan Cox
- *	<[email protected]>. The original 1.8 code is available on www.moxa.com.
+ *	<[email protected]>. The original 1.8 code is available on
+ *	www.moxa.com.
  *	- Fixed x86_64 cleanness
  */
 

index 07ef88b..c15357d 100644
@@ -2,7 +2,7 @@
  *  Copyright (C) 1994-1998	   Linus Torvalds & authors (see below)
  *  Copyright (C) 1998-2002	   Linux ATA Development
  *				      Andre Hedrick <[email protected]>
- *  Copyright (C) 2003		   Red Hat <[email protected]>
+ *  Copyright (C) 2003		   Red Hat
  *  Copyright (C) 2003-2005, 2007  Bartlomiej Zolnierkiewicz
  */
 

index 2cbadff..37ea8c0 100644
@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 2000-2002	Andre Hedrick <[email protected]>
- *  Copyright (C) 2003		Red Hat <[email protected]>
+ *  Copyright (C) 2003		Red Hat
  *
  */
 

index f66c9c3..b80be01 100644
@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 1997-1998	Mark Lord
- *  Copyright (C) 2003		Red Hat <[email protected]>
+ *  Copyright (C) 2003		Red Hat
  *
  *  Some code was moved here from ide.c, see it for original copyrights.
  */

index d647526..0775718 100644
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 1998-2000 Andre Hedrick ([email protected])
  *  May be copied or modified under the terms of the GNU General Public License
- *  Copyright (C) 2002 Alan Cox <[email protected]>
+ *  Copyright (C) 2002 Alan Cox
  *  ALi (now ULi M5228) support by Clear Zhang <[email protected]>
  *  Copyright (C) 2007 MontaVista Software, Inc. <[email protected]>
  *  Copyright (C) 2007 Bartlomiej Zolnierkiewicz <[email protected]>

index b07d4f4..9fd2668 100644
@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 2001-2002	Andre Hedrick <[email protected]>
- *  Portions (C) Copyright 2002  Red Hat Inc <[email protected]>
+ *  Portions (C) Copyright 2002  Red Hat Inc
  *
  * 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 the

index c37ab17..b0d27c9 100644
@@ -52,7 +52,7 @@
  * different clocks on read/write. This requires overloading rw_disk and
  * other deeply crazy things. Thanks to <http://www.hoerstreich.de> for
  * keeping me sane. 
- *		Alan Cox <[email protected]>
+ *		Alan Cox <[email protected]>
  *
  * - fix the clock turnaround code: it was writing to the wrong ports when
  *   called for the secondary channel, caching the current clock mode per-

index 4a1508a..bdaa692 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004		Red Hat <[email protected]>
+ * Copyright (C) 2004		Red Hat
  * Copyright (C) 2007		Bartlomiej Zolnierkiewicz
  *
  *  May be copied or modified under the terms of the GNU General Public License

index bb9d09d..3adef04 100644
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2006		Red Hat <[email protected]>
+ * Copyright (C) 2006		Red Hat
  *
  *  May be copied or modified under the terms of the GNU General Public License
  */

index 30cfc81..0f0aa71 100644
@@ -1,7 +1,7 @@
 /*
  *  Copyright (C) 1998-1999 Andrzej Krzysztofowicz, Author and Maintainer
  *  Copyright (C) 1998-2000 Andre Hedrick <[email protected]>
- *  Copyright (C) 2003 Red Hat Inc <[email protected]>
+ *  Copyright (C) 2003 Red Hat
  *  Copyright (C) 2006-2007 MontaVista Software, Inc. <[email protected]>
  *
  *  May be copied or modified under the terms of the GNU General Public License

index 44cccd1..c041b2a 100644
@@ -5,7 +5,7 @@
  *
  * This code is based on drivers/ide/pci/siimage.c:
  * Copyright (C) 2001-2002	Andre Hedrick <[email protected]>
- * Copyright (C) 2003		Red Hat <[email protected]>
+ * 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

index db2b88a..ec492bc 100644
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2001-2002	Andre Hedrick <[email protected]>
- * Copyright (C) 2003		Red Hat <[email protected]>
+ * Copyright (C) 2003		Red Hat
  * Copyright (C) 2007-2008	MontaVista Software, Inc.
  * Copyright (C) 2007-2008	Bartlomiej Zolnierkiewicz
  *

index efd3aeb..1822c44 100644
@@ -27,7 +27,7 @@
  * 1999-12-20: improved random point rejection, Nathan Laredo
  * 2000-01-05: checked in new anti-jitter code, changed mouse protocol, fixed
  *             queue code, added module options, other fixes, Daniel Quinlan
- * 2002-03-15: Clean up for kernel merge <[email protected]>
+ * 2002-03-15: Clean up for kernel merge <[email protected]>
  *             Fixed multi open race, fixed memory checks, fixed resource
  *             allocation, fixed close/powerdown bug, switched to new init
  * 2005-01-18: Ported to 2.6 from 2.4.28, Rick Koch

index 1f064f4..a62dfd9 100644
@@ -1,7 +1,7 @@
 /* radiotrack (radioreveal) driver for Linux radio support
  * (c) 1997 M. Kirkwood
  * Converted to V4L2 API by Mauro Carvalho Chehab <[email protected]>
- * Converted to new API by Alan Cox <[email protected]>
+ * Converted to new API by Alan Cox <[email protected]>
  * Various bugfixes and enhancements by Russell Kroll <[email protected]>
  *
  * History:

index 04c3698..974f999 100644
@@ -23,7 +23,7 @@
  * 2002-01-17	Adam Belay <[email protected]>
  *		Updated to latest pnp code
  *
- * 2003-01-31	Alan Cox <[email protected]>
+ * 2003-01-31	Alan Cox <[email protected]>
  *		Cleaned up locking, delay code, general odds and ends
  *
  * 2006-07-30	Hans J. Koch <[email protected]>

index 0a0f956..555c029 100644
@@ -8,7 +8,7 @@
  *    RadioTrack II driver for Linux radio support (C) 1998 Ben Pfaff
  *
  *    Based on RadioTrack I/RadioReveal (C) 1997 M. Kirkwood
- *    Converted to new API by Alan Cox <[email protected]>
+ *    Converted to new API by Alan Cox <[email protected]>
  *    Various bugfixes and enhancements by Russell Kroll <[email protected]>
  *
  * TODO: Allow for more than one of these foolish entities :-)

index 6d820e2..f4aa030 100644
@@ -1,7 +1,7 @@
 /* RadioTrack II driver for Linux radio support (C) 1998 Ben Pfaff
  *
  * Based on RadioTrack I/RadioReveal (C) 1997 M. Kirkwood
- * Converted to new API by Alan Cox <[email protected]>
+ * Converted to new API by Alan Cox <[email protected]>
  * Various bugfixes and enhancements by Russell Kroll <[email protected]>
  *
  * TODO: Allow for more than one of these foolish entities :-)

index 0d478f5..25cba98 100644
@@ -3,7 +3,7 @@
  * (c) 1997 M. Kirkwood
  * (c) 1998 Petr Vandrovec, [email protected]
  *
- * Fitted to new interface by Alan Cox <[email protected]>
+ * Fitted to new interface by Alan Cox <[email protected]>
  * Made working and cleaned up functions <[email protected]>
  * Support for ISAPnP by Ladislav Michl <[email protected]>
  *

index af8b9ec..ca6167c 100644
@@ -25,7 +25,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *  Stripped of 2.4 stuff ready for main kernel submit by
- *		Alan Cox <[email protected]>
+ *		Alan Cox <[email protected]>
  *
  ****************************************************************************/
 

index a457474..fb315d2 100644
@@ -25,7 +25,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *  Stripped of 2.4 stuff ready for main kernel submit by
- *		Alan Cox <[email protected]>
+ *		Alan Cox <[email protected]>
  ****************************************************************************/
 
 #include <linux/kernel.h>

index eb9f15c..9eab4b3 100644
@@ -26,7 +26,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  *  Stripped of 2.4 stuff ready for main kernel submit by
- *		Alan Cox <[email protected]>
+ *		Alan Cox <[email protected]>
  ****************************************************************************/
 
 #include <linux/version.h>

index 7c84f79..0e65b1d 100644
@@ -10,8 +10,8 @@
  *	14478 Potsdam, Germany
  *
  *	Most of this code is directly derived from his userspace driver.
- *	His driver works so send any reports to [email protected] unless the
- *	userspace driver also doesn't work for you...
+ *	His driver works so send any reports to [email protected]
+ *	unless the userspace driver also doesn't work for you...
  *
  *      Changes:
  *      08/07/2003        Daniele Bellucci <[email protected]>

index 6ee63e6..ceae434 100644
@@ -15,7 +15,7 @@
  * <[email protected]>
  *
  * with changes by
- * Alan Cox <[email protected]>
+ * Alan Cox <[email protected]>
  *
  * and
  *

index 0d63973..152484e 100644
@@ -8,7 +8,7 @@
  *	you can add arbitary multiple teletext devices to Linux video4linux
  *	now (well 32 anyway).
  *
- *	Alan Cox <[email protected]>
+ *	Alan Cox <[email protected]>
  *
  *	The original driver was heavily modified to match the i2c interface
  *	It was truncated to use the WinTV boards, too.

index 88ca131..b01b137 100644
@@ -28,7 +28,7 @@
  *		as published by the Free Software Foundation; either version
  *		2 of the License, or (at your option) any later version.
  *
- * Author:	Alan Cox, <[email protected]>
+ * Author:	Alan Cox, <[email protected]>
  *
  * Fixes:
  */

index 155fdec..e227cf3 100644
@@ -9,7 +9,7 @@
  *	as published by the Free Software Foundation; either version
  *	2 of the License, or (at your option) any later version.
  *
- * Authors:	Alan Cox, <[email protected]> (version 1)
+ * Authors:	Alan Cox, <[email protected]> (version 1)
  *              Mauro Carvalho Chehab <[email protected]> (version 2)
  *
  * Fixes:	20000516  Claudio Matsuoka <[email protected]>

index 140ef92..0887072 100644
@@ -8,7 +8,7 @@
  * as published by the Free Software Foundation; either version
  * 2 of the License, or (at your option) any later version.
  *
- * Authors:	Alan Cox, <[email protected]> (version 1)
+ * Authors:	Alan Cox, <[email protected]> (version 1)
  *              Mauro Carvalho Chehab <[email protected]> (version 2)
  */
 

index 6cbcc21..ef93fab 100644
@@ -19,7 +19,7 @@
  *		Auvo Häkkinen <[email protected]>
  *		Deepak Saxena <[email protected]>
  *		Boji T Kannanthanam <[email protected]>
- *		Alan Cox <[email protected]>:
+ *		Alan Cox <[email protected]>:
  *			Ported to Linux 2.5.
  *		Markus Lidel <[email protected]>:
  *			Minor fixes for 2.6.

index 4238de9..42d8757 100644
@@ -19,7 +19,7 @@
  *		Changed ioctl_swdl(), implemented ioctl_swul() and ioctl_swdel()
  *	Deepak Saxena (11/18/1999):
  *		Added event managmenet support
- *	Alan Cox <[email protected]>:
+ *	Alan Cox <[email protected]>:
  *		2.4 rewrite ported to 2.5
  *	Markus Lidel <[email protected]>:
  *		Added pass-thru support for Adaptec's raidutils

index da715e1..c58495e 100644
@@ -19,7 +19,7 @@
  *		Auvo Häkkinen <[email protected]>
  *		Deepak Saxena <[email protected]>
  *		Boji T Kannanthanam <[email protected]>
- *		Alan Cox <[email protected]>:
+ *		Alan Cox <[email protected]>:
  *			Ported to Linux 2.5.
  *		Markus Lidel <[email protected]>:
  *			Minor fixes for 2.6.

index 685a895..758366b 100644
@@ -19,7 +19,7 @@
  *		Auvo Häkkinen <[email protected]>
  *		Deepak Saxena <[email protected]>
  *		Boji T Kannanthanam <[email protected]>
- *		Alan Cox <[email protected]>:
+ *		Alan Cox <[email protected]>:
  *			Ported to Linux 2.5.
  *		Markus Lidel <[email protected]>:
  *			Minor fixes for 2.6.

index 5ba4bab..7d15e7c 100644
@@ -17,7 +17,7 @@
 	Annapolis MD 21403
 
     Fixed (again!) the missing interrupt locking on TX/RX shifting.
-	Alan Cox <[email protected]>
+	Alan Cox <[email protected]>
 
     Removed calls to init_etherdev since they are no longer needed, and
     cleaned up modularization just a bit. The driver still allows only

@@ -29,16 +29,16 @@
     the board. Now getting 150K/second FTP with a 3c501 card. Still playing
     with a TX-TX optimisation to see if we can touch 180-200K/second as seems
     theoretically maximum.
-		19950402 Alan Cox <[email protected]>
+		19950402 Alan Cox <[email protected]>
 
     Cleaned up for 2.3.x because we broke SMP now.
-		20000208 Alan Cox <[email protected]>
+		20000208 Alan Cox <[email protected]>
 
     Check up pass for 2.5. Nothing significant changed
-		20021009 Alan Cox <[email protected]>
+		20021009 Alan Cox <[email protected]>
 
     Fixed zero fill corner case
-		20030104 Alan Cox <[email protected]>
+		20030104 Alan Cox <[email protected]>
 
 
    For the avoidance of doubt the "preferred form" of this code is one which

@@ -104,7 +104,7 @@
 
 
 static const char version[] =
-	DRV_NAME ".c: " DRV_VERSION " Alan Cox ([email protected]).\n";
+	DRV_NAME ".c: " DRV_VERSION " Alan Cox ([email protected]).\n";
 
 /*
  *	Braindamage remaining:

index e4e3241..a0f8b6e 100644
@@ -18,7 +18,7 @@
 
 	2001/11/17 - Added ethtool support (jgarzik)
 
-	2002/10/28 - Locking updates for 2.5 ([email protected])
+	2002/10/28 - Locking updates for 2.5 ([email protected])
 
 */
 

index a0b4c85..225b413 100644
@@ -4,7 +4,7 @@
  *      - Jay Schulist <[email protected]>
  *
  *	With more than a little help from;
- *	- Alan Cox <[email protected]> 
+ *	- Alan Cox <[email protected]> 
  *
  *      Derived from:
  *      - skeleton.c: A network driver outline for linux.

index 795c594..b751c1b 100644
@@ -8,7 +8,7 @@
  *
  * Many modifications, and currently maintained, by
  *  Philip Blundell <[email protected]>
- * Added the Compaq LTE  Alan Cox <[email protected]>
+ * Added the Compaq LTE  Alan Cox <[email protected]>
  * Added MCA support Adam Fritzler
  *
  * Note - this driver is experimental still - it has problems on faster

index 95e3464..be0fedf 100644
@@ -71,7 +71,7 @@ History:
   June 1st, 2000
 	corrected version codes, added support for the latest 2.3 changes
   Oct 28th, 2002
-  	cleaned up for the 2.5 tree <[email protected]>
+  	cleaned up for the 2.5 tree <[email protected]>
 
  *************************************************************************/
 

index 51ad376..85587a6 100644
@@ -9,7 +9,7 @@
  *	2 of the License, or (at your option) any later version.
  *
  *	Copyright (C) 1996 Paul Mackerras.
- *	Copyright (C) 1998 Alan Cox <[email protected]>
+ *	Copyright (C) 1998 Alan Cox <[email protected]>
  *
  *	Modified heavily by Joshua M. Thompson based on Dave Huang's NetBSD driver
  *

index 549a645..29bd853 100644
@@ -15,7 +15,7 @@
     incorporated herein by reference.
     Donald Becker may be reached at [email protected]
     
-    Updated for 2.5.x by Alan Cox <[email protected]>
+    Updated for 2.5.x by Alan Cox <[email protected]>
 
 ======================================================================*/
 

index cfcbea9..ee5dcbf 100644
@@ -69,7 +69,7 @@ Driver Notes and Issues
 History
 -------------------------------------------------------------------------------
 Log: nmclan_cs.c,v
- * 2.5.75-ac1 2003/07/11 Alan Cox <[email protected]>
+ * 2.5.75-ac1 2003/07/11 Alan Cox <[email protected]>
  * Fixed hang on card eject as we probe it
  * Cleaned up to use new style locking.
  *

index ec871f6..c41d687 100644
@@ -29,7 +29,8 @@
  *
  *	Tigran Aivazian <[email protected]>:	TLan_PciProbe() now uses
  *						new PCI BIOS interface.
- *	Alan Cox	<[email protected]>:	Fixed the out of memory
+ *	Alan Cox	<[email protected]>:
+ *						Fixed the out of memory
  *						handling.
  *
  *	Torben Mathiasen <[email protected]> New Maintainer!

index fa73e6e..ed50d28 100644
@@ -25,7 +25,7 @@
  *  To do:
  *    1. Multicast support.
  *
- *  Initial 2.5 cleanup Alan Cox <[email protected]>  2002/10/28
+ *  Initial 2.5 cleanup Alan Cox <[email protected]>  2002/10/28
  */
 
 #include <linux/module.h>

index 6562004..8e46a51 100644
@@ -23,7 +23,7 @@
     Marcelo Tosatti <[email protected]> :
     Made it compile in 2.3 (device to net_device)
 
-    Alan Cox <[email protected]> :
+    Alan Cox <[email protected]> :
     Cleaned up for kernel merge.
     Removed the back compatibility support
     Reformatted, fixing spelling etc as I went

@@ -49,7 +49,7 @@
     support.  Updated PCI resource allocation.  Do not
     forget to unmap PCI mapped skbs.
 
-    Alan Cox <[email protected]>
+    Alan Cox <[email protected]>
     Added new PCI identifiers provided by Clear Zhang at ALi
     for their 1563 ethernet device.
 

index 007c129..fd37d87 100644
@@ -12,7 +12,7 @@
  *	Scatter gather
  *	More testing
  *
- * The changes are (c) Copyright 2004, Red Hat Inc. <[email protected]>
+ * The changes are (c) Copyright 2004, Red Hat Inc. <[email protected]>
  * Additional fixes and clean up: Francois Romieu
  *
  * This source has not been verified for use in safety critical systems.

index 243bd8d..ccd9cd3 100644
@@ -18,7 +18,8 @@
  *	DMA now uses get_free_page as kmalloc buffers may span a 64K 
  *	boundary.
  *
- *	Modified for SMP safety and SMP locking by Alan Cox <[email protected]>
+ *	Modified for SMP safety and SMP locking by Alan Cox
+ *					<[email protected]>
  *
  *	Performance
  *

index 4f37239..85b3e78 100644
@@ -2,7 +2,7 @@
  *	Description of Z8530 Z85C30 and Z85230 communications chips
  *
  * Copyright (C) 1995 David S. Miller ([email protected])
- * Copyright (C) 1998 Alan Cox <[email protected]>
+ * Copyright (C) 1998 Alan Cox <[email protected]>
  */
 
 #ifndef _Z8530_H

index 136220b..e939a73 100644
@@ -4387,7 +4387,7 @@ MODULE_LICENSE("GPL");
  *
  * Thanks go also to:
  *	James Ashton ([email protected]),
- *	Alan Cox ([email protected]),
+ *	Alan Cox ([email protected]),
  *	Allan Creighton ([email protected]),
  *	Matthew Geier ([email protected]),
  *	Remo di Giovanni ([email protected]),

index b33ac47..44d31bb 100644
@@ -186,7 +186,7 @@
  *
  * Thanks go also to:
  *	James Ashton <[email protected]>,
- *	Alan Cox <[email protected]>,
+ *	Alan Cox <[email protected]>,
  *	Allan Creighton <[email protected]>,
  *	Matthew Geier <[email protected]>,
  *	Remo di Giovanni <[email protected]>,

index bee5100..a454d4b 100644
@@ -10,7 +10,7 @@
  *      the Free Software Foundation; either version 2 of the License, or
  *      (at your option) any later version.
  *
- *	by Alan Cox <[email protected]> and 
+ *	by Alan Cox <[email protected]> and 
  * 	   Alex deVries <[email protected]>
  */
 

index 19a4be1..32d1202 100644
@@ -11,7 +11,7 @@
  * Modifications (C) 1998 Tom Lees <[email protected]>
  * Minor reorganizations by David Hinds <[email protected]>
  * Further modifications (C) 2001, 2002 by:
- *   Alan Cox <[email protected]>
+ *   Alan Cox <[email protected]>
  *   Thomas Hood
  *   Brian Gerst <[email protected]>
  *

index eeddbd1..f92da9f 100644
@@ -30,7 +30,7 @@
  * $Log: NCR5380.c,v $
 
  * Revision 1.10 1998/9/2	Alan Cox
- *				([email protected])
+ *				([email protected])
  * Fixed up the timer lockups reported so far. Things still suck. Looking 
  * forward to 2.3 and per device request queues. Then it'll be possible to
  * SMP thread this beast and improve life no end.

index 84bb616..3c298c7 100644
@@ -54,7 +54,7 @@
  * 9/28/04 Christoph Hellwig <[email protected]>
  *	    - merge the two source files
  *	    - remove internal queueing code
- * 14/06/07 Alan Cox <[email protected]>
+ * 14/06/07 Alan Cox <[email protected]>
  *	 - Grand cleanup and Linuxisation
  */
 

index aa4e77c..d69e539 100644
@@ -1,6 +1,6 @@
 /*
  *	Adaptec AAC series RAID controller driver
- *	(c) Copyright 2001 Red Hat Inc.	<[email protected]>
+ *	(c) Copyright 2001 Red Hat Inc.
  *
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.

index a735526..9377f83 100644
@@ -1,6 +1,6 @@
 /*
  *	Adaptec AAC series RAID controller driver
- *	(c) Copyright 2001 Red Hat Inc.	<[email protected]>
+ *	(c) Copyright 2001 Red Hat Inc.
  *
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.

index cbac063..1631044 100644
@@ -1,6 +1,6 @@
 /*
  *	Adaptec AAC series RAID controller driver
- *	(c) Copyright 2001 Red Hat Inc.	<[email protected]>
+ *	(c) Copyright 2001 Red Hat Inc.
  *
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.

index 289304a..d24c267 100644
@@ -1,6 +1,6 @@
 /*
  *	Adaptec AAC series RAID controller driver
- *	(c) Copyright 2001 Red Hat Inc.	<[email protected]>
+ *	(c) Copyright 2001 Red Hat Inc.
  *
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.

index 933f208..abc9ef5 100644
@@ -1,6 +1,6 @@
 /*
  *	Adaptec AAC series RAID controller driver
- *	(c) Copyright 2001 Red Hat Inc.	<[email protected]>
+ *	(c) Copyright 2001 Red Hat Inc.
  *
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.

index 9aa301c..1c5ac39 100644
@@ -1,6 +1,6 @@
 /*
  *	Adaptec AAC series RAID controller driver
- *	(c) Copyright 2001 Red Hat Inc.	<[email protected]>
+ *	(c) Copyright 2001 Red Hat Inc.
  *
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.

index 8cd6588..16d8db5 100644
@@ -1,6 +1,6 @@
 /*
  *	Adaptec AAC series RAID controller driver
- *	(c) Copyright 2001 Red Hat Inc.	<[email protected]>
+ *	(c) Copyright 2001 Red Hat Inc.
  *
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.

index 073208b..f70d9f8 100644
@@ -1,6 +1,6 @@
 /*
  *	Adaptec AAC series RAID controller driver
- *	(c) Copyright 2001 Red Hat Inc.	<[email protected]>
+ *	(c) Copyright 2001 Red Hat Inc.
  *
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.

index fc1a557..b6a3c5c 100644
@@ -1,6 +1,6 @@
 /*
  *	Adaptec AAC series RAID controller driver
- *	(c) Copyright 2001 Red Hat Inc.	<[email protected]>
+ *	(c) Copyright 2001 Red Hat Inc.
  *
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.

index 7c45d88..ed0e3e5 100644
@@ -22,7 +22,7 @@
  * aha1740_makecode may still need even more work
  * if it doesn't work for your devices, take a look.
  *
- * Reworked for new_eh and new locking by Alan Cox <[email protected]>
+ * Reworked for new_eh and new locking by Alan Cox <[email protected]>
  *
  * Converted to EISA and generic DMA APIs by Marc Zyngier
  * <[email protected]>, 4/2003.

index 7d31154..20ca0a6 100644
@@ -1,8 +1,8 @@
 /* 
  *  Copyright (C) 1997	Wu Ching Chen
  *  2.1.x update (C) 1998  Krzysztof G. Baranowski
- *  2.5.x update (C) 2002  Red Hat <[email protected]>
- *  2.6.x update (C) 2004  Red Hat <[email protected]>
+ *  2.5.x update (C) 2002  Red Hat
+ *  2.6.x update (C) 2004  Red Hat
  *
  * Marcelo Tosatti <[email protected]> : SMP fixes
  *

index 952505c..152dd15 100644
@@ -14,8 +14,8 @@
  *             [email protected]               *
  *             [email protected]                      * 
  *                                                          *
- *  Updated 2002 by Alan Cox <[email protected]> for Linux    *
- *  2.5.x and the newer locking and error handling          *
+ *  Updated 2002 by Alan Cox <[email protected]> for *
+ *   Linux 2.5.x and the newer locking and error handling   *
  *                                                          *
  *  This program is free software; you can redistribute it  *
  *  and/or modify it under the terms of the GNU General     *

index c33bcb2..31afaa7 100644
@@ -3,7 +3,7 @@
  * Revised: Mon Dec 28 21:59:02 1998 by [email protected]
  * Author: Rickard E. Faith, [email protected]
  * Copyright 1992-1996, 1998 Rickard E. Faith ([email protected])
- * Shared IRQ supported added 7/7/2001  Alan Cox <[email protected]>
+ * Shared IRQ supported added 7/7/2001  Alan Cox <[email protected]>
 
  * 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 the

index 4d15a62..9c1e6a5 100644
@@ -10,7 +10,7 @@
  See the WWW-page: http://www.uni-mainz.de/~langm000/linux.html for latest
  updates, info and ADF-files for adapters supported by this driver.
 
- Alan Cox <[email protected]>
+ Alan Cox <[email protected]>
  Updated for Linux 2.5.45 to use the new error handler, cleaned up the
  lock macros and did a few unavoidable locking tweaks, plus one locking
  fix in the irq and completion path.

index 8053b1e..52bdc6d 100644
@@ -107,7 +107,7 @@
  * this thing into as good a shape as possible, and I'm positive
  * there are lots of lurking bugs and "Stupid Places".
  *
- * Updated for Linux 2.5 by Alan Cox <[email protected]>
+ * Updated for Linux 2.5 by Alan Cox <[email protected]>
  *	- Using new_eh handler
  *	- Hopefully got all the locking right again
  *	See "FIXME" notes for items that could do with more work

index e3f7397..5529518 100644
@@ -4,7 +4,7 @@
  * Copyright (c) 1994-1998 Initio Corporation
  * Copyright (c) 1998 Bas Vermeulen <[email protected]>
  * Copyright (c) 2004 Christoph Hellwig <[email protected]>
- * Copyright (c) 2007 Red Hat <[email protected]>
+ * Copyright (c) 2007 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

index cb48efa..e58af9e 100644
@@ -4,7 +4,7 @@
  * Copyright (c) 1994-1998 Initio Corporation
  * All rights reserved.
  *
- * Cleanups (c) Copyright 2007 Red Hat <[email protected]>
+ * Cleanups (c) Copyright 2007 Red Hat <[email protected]>
  *
  * 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

index 4871dd1..5945914 100644
@@ -19,7 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * Alan Cox <[email protected]> - Removed several careless u32/dma_addr_t errors
+ * Alan Cox <[email protected]> - Removed several careless u32/dma_addr_t errors
  *				that broke 64bit platforms.
  */
 

index de7b3bc..1ad5155 100644
@@ -23,7 +23,7 @@
    Functions as standalone, loadable, and PCMCIA driver, the latter from
    Dave Hinds' PCMCIA package.
    
-   Cleaned up 26/10/2002 by Alan Cox <[email protected]> as part of the 2.5
+   Cleaned up 26/10/2002 by Alan Cox <[email protected]> as part of the 2.5
    SCSI driver cleanup and audit. This driver still needs work on the
    following
    	-	Non terminating hardware waits

index f7d2795..e5c369b 100644
@@ -6,7 +6,7 @@
  *  Changes : 
  * 
  *  Marcelo Tosatti <[email protected]> : Added io_request_lock locking
- *  Alan Cox <[email protected]> : Cleaned up code formatting
+ *  Alan Cox <[email protected]> : Cleaned up code formatting
  *				 Fixed an irq locking bug
  *				 Added ISAPnP support
  *  Bjoern A. Zeeb <[email protected]> : Initial irq locking updates

index d4c1356..093610b 100644
@@ -146,13 +146,13 @@
  *
  * use host->host_lock, not io_request_lock, cleanups
  *
- * 2002/10/04 - Alan Cox <[email protected]>
+ * 2002/10/04 - Alan Cox <[email protected]>
  *
  * Use dev_id for interrupts, kill __func__ pasting
  * Add a lock for the scb pool, clean up all other cli/sti usage stuff
  * Use the adapter lock for the other places we had the cli's
  *
- * 2002/10/06 - Alan Cox <[email protected]>
+ * 2002/10/06 - Alan Cox <[email protected]>
  *
  * Switch to new style error handling
  * Clean up delay to udelay, and yielding sleeps

index 4d74ba3..607742e 100644
@@ -8,7 +8,7 @@
  *              as published by the Free Software Foundation; either version
  *              2 of the License, or (at your option) any later version.
  *
- * Author:      Alan Cox, <[email protected]>
+ * Author:      Alan Cox, <[email protected]>
  *
  * Fixes:       Mar 01 2000 Thomas Sparr, <[email protected]>
  *              phone_register_device now works with unit!=PHONE_UNIT_ANY

index 45d4043..75765b9 100644
@@ -26,7 +26,7 @@
  *	Introduced common header to be used also in USB Gadget Framework.
  *	Still needs some other style fixes.
  *
- * 2007_Jun_21  Alan Cox <[email protected]>
+ * 2007_Jun_21  Alan Cox <[email protected]>
  *	Minimal cleanups for some of the driver problens and tty layer abuse.
  *	Still needs fixing to allow multiple dongles.
  *

index 5b11a00..5eee727 100644
@@ -17,7 +17,7 @@
  *	(port driver to new frambuffer infrastructure)
  * 01/2003 Helge Deller    <[email protected]>
  *	(initial work on fb hardware acceleration for voodoo2)
- * 08/2006 Alan Cox 	   <[email protected]>
+ * 08/2006 Alan Cox 	   <[email protected]>
  *	Remove never finished and bogus 24/32bit support
  *	Clean up macro abuse
  *	Minor tidying for format.

index 6e46a55..3e57aa4 100644
@@ -3,8 +3,8 @@
  *
  *      Based on wdt.c. Original copyright messages:
  *
- *	(c) Copyright 1996 Alan Cox <[email protected]>, All Rights Reserved.
- *				http://www.redhat.com
+ *	(c) Copyright 1996 Alan Cox <[email protected]>,
+ *						All Rights Reserved.
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License

@@ -15,7 +15,7 @@
  *	warranty for any of this software. This material is provided
  *	"AS-IS" and at no charge.
  *
- *	(c) Copyright 1995    Alan Cox <[email protected]>
+ *	(c) Copyright 1995    Alan Cox <[email protected]>
  *
  *      14-Dec-2001 Matt Domsch <[email protected]>
  *          Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT

index a5110f9..a1d7856 100644
@@ -6,8 +6,8 @@
  *	Based on acquirewdt.c which is based on wdt.c.
  *	Original copyright messages:
  *
- *	(c) Copyright 1996 Alan Cox <[email protected]>, All Rights Reserved.
- *				http://www.redhat.com
+ *	(c) Copyright 1996 Alan Cox <[email protected]>,
+ *						All Rights Reserved.
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License

@@ -18,7 +18,7 @@
  *	warranty for any of this software. This material is provided
  *	"AS-IS" and at no charge.
  *
- *	(c) Copyright 1995    Alan Cox <[email protected]>
+ *	(c) Copyright 1995    Alan Cox <[email protected]>
  *
  *	14-Dec-2001 Matt Domsch <[email protected]>
  *	    Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT

index 31b4225..067a57c 100644
@@ -5,7 +5,7 @@
  * Originally based on softdog.c
  * Copyright 2006-2007 Analog Devices Inc.
  * Copyright 2006-2007 Michele d'Amico
- * Copyright 1996 Alan Cox <[email protected]>
+ * Copyright 1996 Alan Cox <[email protected]>
  *
  * Enter bugs at http://blackfin.uclinux.org/
  *

index bbd14e3..a171fc6 100644
@@ -8,8 +8,8 @@
  *	Based on wdt.c.
  *	Original copyright messages:
  *
- *      (c) Copyright 1996-1997 Alan Cox <[email protected]>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996-1997 Alan Cox <[email protected]>,
+ *						All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License

index d48a704..6dfdf19 100644
@@ -11,8 +11,8 @@
  *	Based on acquirewdt.c which is based on wdt.c.
  *	Original copyright messages:
  *
- *	(c) Copyright 1996 Alan Cox <[email protected]>, All Rights Reserved.
- *				http://www.redhat.com
+ *	(c) Copyright 1996 Alan Cox <[email protected]>,
+ 					All Rights Reserved.
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License

@@ -23,7 +23,7 @@
  *	warranty for any of this software. This material is provided
  *	"AS-IS" and at no charge.
  *
- *	(c) Copyright 1995    Alan Cox <[email protected]>
+ *	(c) Copyright 1995    Alan Cox <[email protected]>
  *
  *	14-Dec-2001 Matt Domsch <[email protected]>
  *	     Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT

index 73c9e79..0f761db 100644
@@ -9,7 +9,7 @@
  *	as published by the Free Software Foundation; either version
  *	2 of the License, or (at your option) any later version.
  *
- *	based on softdog.c by Alan Cox <[email protected]>
+ *	based on softdog.c by Alan Cox <[email protected]>
  */
 
 #include <linux/module.h>

index 2a9bfa8..1130ad6 100644
@@ -4,8 +4,8 @@
  *	(c) Copyright 2004 ARM Limited
  *
  *	Based on the SoftDog driver:
- *	(c) Copyright 1996 Alan Cox <[email protected]>, All Rights Reserved.
- *				http://www.redhat.com
+ *	(c) Copyright 1996 Alan Cox <[email protected]>,
+ * 						All Rights Reserved.
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License

index 3a11dad..c159dd8 100644
@@ -16,7 +16,7 @@
  * 20030527: George G. Davis <[email protected]>
  *	Initially based on linux-2.4.19-rmk7-pxa1/drivers/char/sa1100_wdt.c
  *	(c) Copyright 2000 Oleg Drokin <[email protected]>
- *	Based on SoftDog driver by Alan Cox <[email protected]>
+ *	Based on SoftDog driver by Alan Cox <[email protected]>
  *
  * Copyright (c) 2004 Texas Instruments.
  *	1. Modified to support OMAP1610 32-KHz watchdog timer

index 90eb1d4..5d76422 100644
@@ -6,7 +6,7 @@
  *	Based on source code of the following authors:
  *	  Ken Hollis <[email protected]>,
  *	  Lindsay Harris <[email protected]>,
- *	  Alan Cox <[email protected]>,
+ *	  Alan Cox <[email protected]>,
  *	  Matt Domsch <[email protected]>,
  *	  Rob Radez <[email protected]>
  *

index c1685c9..afb0896 100644
@@ -5,7 +5,7 @@
  *
  *	Based on source code of the following authors:
  *	  Ken Hollis <[email protected]>,
- *	  Alan Cox <[email protected]>,
+ *	  Alan Cox <[email protected]>,
  *	  Matt Domsch <[email protected]>,
  *	  Rob Radez <[email protected]>,
  *	  Greg Kroah-Hartman <[email protected]>

index c9c73b6..57027f4 100644
@@ -7,7 +7,8 @@
  *  based on
  *  SoftDog 0.05:	A Software Watchdog Device
  *
- *  (c) Copyright 1996 Alan Cox <[email protected]>, All Rights Reserved.
+ *  (c) Copyright 1996 Alan Cox <[email protected]>,
+ *					All Rights Reserved.
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License

index 86d4280..f7f6ce8 100644
@@ -6,7 +6,7 @@
  * S3C2410 Watchdog Timer Support
  *
  * Based on, softdog.c by Alan Cox,
- *     (c) Copyright 1996 Alan Cox <[email protected]>
+ *     (c) Copyright 1996 Alan Cox <[email protected]>
  *
  * 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

index 31a4843..ed01e4c 100644
@@ -2,7 +2,7 @@
  *	Watchdog driver for the SA11x0/PXA2xx
  *
  *      (c) Copyright 2000 Oleg Drokin <[email protected]>
- *          Based on SoftDog driver by Alan Cox <[email protected]>
+ *          Based on SoftDog driver by Alan Cox <[email protected]>
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License

index 27e526a..38f5831 100644
@@ -35,8 +35,8 @@
  * Based on various other watchdog drivers, which are probably all
  * loosely based on something Alan Cox wrote years ago.
  *
- *	(c) Copyright 1996 Alan Cox <[email protected]>, All Rights Reserved.
- *				http://www.redhat.com
+ *	(c) Copyright 1996 Alan Cox <[email protected]>,
+ *						All Rights Reserved.
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License

index fd83dd0..ae74f6b 100644
@@ -16,8 +16,8 @@
  *	Based on acquirewdt.c which is based on wdt.c.
  *	Original copyright messages:
  *
- *	(c) Copyright 1996 Alan Cox <[email protected]>, All Rights Reserved.
- *				http://www.redhat.com
+ *	(c) Copyright 1996 Alan Cox <[email protected]>,
+ *						All Rights Reserved.
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License

@@ -28,7 +28,7 @@
  *	warranty for any of this software. This material is provided
  *	"AS-IS" and at no charge.
  *
- *	(c) Copyright 1995    Alan Cox <[email protected]>
+ *	(c) Copyright 1995    Alan Cox <[email protected]>
  *
  *      14-Dec-2001 Matt Domsch <[email protected]>
  *           Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT

index e5e470c..06553de 100644
@@ -10,7 +10,7 @@
  *	as published by the Free Software Foundation; either version
  *	2 of the License, or (at your option) any later version.
  *
- *	based on softdog.c by Alan Cox <[email protected]>
+ *	based on softdog.c by Alan Cox <[email protected]>
  */
 
 #include <linux/module.h>

index 988ff1d..7d6ae9e 100644
@@ -1,7 +1,7 @@
 /*
  *	SMsC 37B787 Watchdog Timer driver for Linux 2.6.x.x
  *
- *      Based on acquirewdt.c by Alan Cox <[email protected]>
+ *      Based on acquirewdt.c by Alan Cox <[email protected]>
  *       and some other existing drivers
  *
  *	This program is free software; you can redistribute it and/or

index c650464..7204f96 100644
@@ -1,8 +1,7 @@
 /*
  *	SoftDog	0.07:	A Software Watchdog Device
  *
- *	(c) Copyright 1996 Alan Cox <[email protected]>, All Rights Reserved.
- *				http://www.redhat.com
+ *	(c) Copyright 1996 Alan Cox <[email protected]>, All Rights Reserved.
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License

index 69396ad..916890a 100644
@@ -11,8 +11,8 @@
  *
  *	(c) Copyright 2000-2001 Marek Michalkiewicz <[email protected]>
  *
- *	(c) Copyright 1996 Alan Cox <[email protected]>, All Rights Reserved.
- *				http://www.redhat.com
+ *	(c) Copyright 1996 Alan Cox <[email protected]>,
+ *						All Rights Reserved.
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License

@@ -23,7 +23,7 @@
  *	warranty for any of this software. This material is provided
  *	"AS-IS" and at no charge.
  *
- *	(c) Copyright 1995    Alan Cox <[email protected]>
+ *	(c) Copyright 1995    Alan Cox <[email protected]>
  */
 
 #include <linux/module.h>

index 445d30a..3c7aa41 100644
@@ -12,8 +12,8 @@
  *
  *	(c) Copyright 2000-2001 Marek Michalkiewicz <[email protected]>
  *
- *	(c) Copyright 1996 Alan Cox <[email protected]>, All Rights Reserved.
- *				http://www.redhat.com
+ *	(c) Copyright 1996 Alan Cox <[email protected]>,
+ *						All Rights Reserved.
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License

index 68377ae..42e940c 100644
@@ -10,8 +10,8 @@
  *	Based on advantechwdt.c which is based on wdt.c.
  *	Original copyright messages:
  *
- *	(c) Copyright 1996-1997 Alan Cox <[email protected]>, All Rights Reserved.
- *				http://www.redhat.com
+ *	(c) Copyright 1996-1997 Alan Cox <[email protected]>,
+ *						All Rights Reserved.
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License

index deeebb2..eddb918 100644
@@ -1,8 +1,8 @@
 /*
  *	Industrial Computer Source WDT500/501 driver
  *
- *	(c) Copyright 1996-1997 Alan Cox <[email protected]>, All Rights Reserved.
- *				http://www.redhat.com
+ *	(c) Copyright 1996-1997 Alan Cox <[email protected]>,
+ *						All Rights Reserved.
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License

index 191ea63..f551356 100644
@@ -6,7 +6,8 @@
  *
  *	SoftDog	0.05:	A Software Watchdog Device
  *
- *	(c) Copyright 1996 Alan Cox <[email protected]>, All Rights Reserved.
+ *	(c) Copyright 1996 Alan Cox <[email protected]>,
+ *						All Rights Reserved.
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License

index ed02bdb..c45839a 100644
@@ -1,8 +1,8 @@
 /*
  *	Industrial Computer Source PCI-WDT500/501 driver
  *
- *	(c) Copyright 1996-1997 Alan Cox <[email protected]>, All Rights Reserved.
- *				http://www.redhat.com
+ *	(c) Copyright 1996-1997 Alan Cox <[email protected]>,
+ *						 All Rights Reserved.
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License

index 0d9b80e..136747b 100644
@@ -2,7 +2,7 @@
  *      	An implementation of a loadable kernel mode driver providing
  *		multiple kernel/user space bidirectional communications links.
  *
- * 		Author: 	Alan Cox <[email protected]>
+ * 		Author: 	Alan Cox <[email protected]>
  *
  *		This program is free software; you can redistribute it and/or
  *		modify it under the terms of the GNU General Public License

index 52daefa..f797879 100644
@@ -5,7 +5,7 @@
  *
  *  nfs inode and superblock handling functions
  *
- *  Modularised by Alan Cox <[email protected]>, while hacking some
+ *  Modularised by Alan Cox <[email protected]>, while hacking some
  *  experimental NFS changes. Modularisation taken straight from SYS5 fs.
  *
  *  Change to nfs_read_super() to permit NFS mounts to multi-homed hosts.

index e9b2017..a42a000 100644
@@ -5,7 +5,7 @@
  *
  *  nfs superblock handling functions
  *
- *  Modularised by Alan Cox <[email protected]>, while hacking some
+ *  Modularised by Alan Cox <[email protected]>, while hacking some
  *  experimental NFS changes. Modularisation taken straight from SYS5 fs.
  *
  *  Change to nfs_read_super() to permit NFS mounts to multi-homed hosts.

index 71c9be5..b330c7d 100644
@@ -40,7 +40,7 @@
  *
  *
  * Alan Cox	     :  security fixes.
- *			<[email protected]>
+ *			<[email protected]>
  *
  * Al Viro           :  safe handling of mm_struct
  *

index 6b9008c..4899342 100644
@@ -4,7 +4,7 @@
 /*
  * Constants for various Intel APICs. (local APIC, IOAPIC, etc.)
  *
- * Alan Cox <[email protected]>, 1995.
+ * Alan Cox <[email protected]>, 1995.
  * Ingo Molnar <[email protected]>, 1999, 2000
  */
 

index bb1c09f..aead822 100644
@@ -12,7 +12,7 @@
  *
  * Copyrights from kernel/smp.c:
  *
- * (c) 1995 Alan Cox, Building #3 <[email protected]>
+ * (c) 1995 Alan Cox, Building #3 <[email protected]>
  * (c) 1998-99, 2000 Ingo Molnar <[email protected]>
  * (c) 2002,2003 Andi Kleen, SuSE Labs.
  * Subject to the GNU Public License, v.2

index e157c13..f773f0e 100644
@@ -9,7 +9,7 @@
  *
  * Author:	Fred N. van Kempen, <[email protected]>
  *		Donald Becker, <[email protected]>
- *		Alan Cox, <[email protected]>
+ *		Alan Cox, <[email protected]>
  *		Steve Whitehouse, <[email protected]>
  *
  *		This program is free software; you can redistribute it and/or

index ae77dae..45de104 100644
@@ -12,7 +12,7 @@
  *		if_fddi.h is based on previous if_ether.h and if_tr.h work by
  *			Fred N. van Kempen, <[email protected]>
  *			Donald Becker, <[email protected]>
- *			Alan Cox, <[email protected]>
+ *			Alan Cox, <[email protected]>
  *			Steve Whitehouse, <[email protected]>
  *			Peter De Schrijver, <[email protected]>
  *

index 94d31ca..f0f2351 100644
@@ -9,7 +9,7 @@
  *
  * Author:	Fred N. van Kempen, <[email protected]>
  *		Donald Becker, <[email protected]>
- *		Alan Cox, <[email protected]>
+ *		Alan Cox, <[email protected]>
  *		Steve Whitehouse, <[email protected]>
  *		Jes Sorensen, <[email protected]>
  *

index 7bb3c09..f734a0b 100644
@@ -2,7 +2,7 @@
  *	Linux NET3:	Internet Group Management Protocol  [IGMP]
  *
  *	Authors:
- *		Alan Cox <[email protected]>
+ *		Alan Cox <[email protected]>
  *
  *	Extended to talk the BSD extended IGMP protocol of mrouted 3.6
  *

index 488c56e..5a9144e 100644
@@ -11,7 +11,7 @@
  *		Fred N. van Kempen, <[email protected]>
  *		Corey Minyard <[email protected]>
  *		Donald J. Becker, <[email protected]>
- *		Alan Cox, <[email protected]>
+ *		Alan Cox, <[email protected]>
  *		Bjorn Ekwall. <[email protected]>
  *              Pekka Riikonen <[email protected]>
  *

index da2698b..e3f76df 100644
@@ -4,7 +4,7 @@
  *	that modules can poke their nose into the innards. The network devices
  *	needed them so here they are for the rest of you.
  *
- *				Alan Cox <[email protected]>
+ *				Alan Cox <[email protected]>
  */
  
 #ifndef _LINUX_NOTIFIER_H

index 66484d4..8408102 100644
@@ -3,7 +3,7 @@
 
 /*
  *	Generic SMP support
- *		Alan Cox. <[email protected]>
+ *		Alan Cox. <[email protected]>
  */
 
 #include <linux/errno.h>

index 0d0cf2a..40e7d49 100644
@@ -14,7 +14,7 @@
  *    Authors:       Ed Okerson, <[email protected]>
  *                   Greg Herlein, <[email protected]>
  *
- *    Contributors:  Alan Cox, <[email protected]>
+ *    Contributors:  Alan Cox, <[email protected]>
  *                   David W. Erhart, <[email protected]>
  *
  * IN NO EVENT SHALL QUICKNET TECHNOLOGIES, INC. BE LIABLE TO ANY PARTY FOR

index bf1bc36..99578a5 100644
@@ -58,7 +58,7 @@
  * SMP-threaded, sysctl's added
  * (c) 1999 Manfred Spraul <[email protected]>
  * Enforced range limit on SEM_UNDO
- * (c) 2001 Red Hat Inc <[email protected]>
+ * (c) 2001 Red Hat Inc
  * Lockless wakeup
  * (c) 2003 Manfred Spraul <[email protected]>
  *

index e7a5a68..2d2ee03 100644
@@ -3,7 +3,7 @@
  *
  * Written by obz.
  *
- * Address space accounting code	<[email protected]>
+ * Address space accounting code	<[email protected]>
  */
 
 #include <linux/slab.h>

index fded06f..cfb4c48 100644
@@ -4,7 +4,7 @@
  *  (C) Copyright 1994 Linus Torvalds
  *  (C) Copyright 2002 Christoph Hellwig
  *
- *  Address space accounting code	<[email protected]>
+ *  Address space accounting code	<[email protected]>
  *  (C) Copyright 2002 Red Hat Inc, All Rights Reserved
  */
 

index 1a77439..4eb27d5 100644
@@ -3,7 +3,7 @@
  *
  *	(C) Copyright 1996 Linus Torvalds
  *
- *	Address space accounting code	<[email protected]>
+ *	Address space accounting code	<[email protected]>
  *	(C) Copyright 2002 Red Hat Inc, All Rights Reserved
  */
 

index b3cfe5a..70980ba 100644
@@ -1,7 +1,7 @@
 /*
  *	SNAP data link layer. Derived from 802.2
  *
- *		Alan Cox <[email protected]>,
+ *		Alan Cox <[email protected]>,
  *		from the 802.2 layer by Greg Page.
  *		Merged in additions from Greg Page's psnap.c.
  *

index 0c85042..d3134e7 100644
@@ -2,7 +2,7 @@
  *	DDP:	An implementation of the AppleTalk DDP protocol for
  *		Ethernet 'ELAP'.
  *
- *		Alan Cox  <[email protected]>
+ *		Alan Cox  <[email protected]>
  *
  *		With more than a little assistance from
  *

@@ -1934,6 +1934,6 @@ static void __exit atalk_exit(void)
 module_exit(atalk_exit);
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Alan Cox <[email protected]>");
+MODULE_AUTHOR("Alan Cox <[email protected]>");
 MODULE_DESCRIPTION("AppleTalk 0.20\n");
 MODULE_ALIAS_NETPROTO(PF_APPLETALK);

index 52f577a..ee63184 100644
@@ -9,7 +9,7 @@
  *	identical recvmsg() code. So we share it here. The poll was
  *	shared before but buried in udp.c so I moved it.
  *
- *	Authors:	Alan Cox <[email protected]>. (datagram_poll() from old
+ *	Authors:	Alan Cox <[email protected]>. (datagram_poll() from old
  *						     udp.c code)
  *
  *	Fixes:

index 5402b3b..9e2fa39 100644
@@ -6,7 +6,7 @@
  *		Richard Underwood <[email protected]>
  *
  *	Stir fried together from the IP multicast and CAP patches above
- *		Alan Cox <[email protected]>
+ *		Alan Cox <[email protected]>
  *
  *	Fixes:
  *		Alan Cox	:	Update the device on a real delete

index ca1ccdf..af8ad7c 100644
@@ -1,7 +1,7 @@
 /*
  *	Routines having to do with the 'struct sk_buff' memory handlers.
  *
- *	Authors:	Alan Cox <[email protected]>
+ *	Authors:	Alan Cox <[email protected]>
  *			Florian La Roche <[email protected]>
  *
  *	Fixes:

index a6b3437..8727cea 100644
@@ -9,7 +9,7 @@
  *
  *     Authors:        Arnaldo Carvalho de Melo <[email protected]>
  *                     (from old tcp.c code)
- *                     Alan Cox <[email protected]> (Borrowed comments 8-))
+ *                     Alan Cox <[email protected]> (Borrowed comments 8-))
  */
 
 #include <linux/module.h>

index 55c355e..72b2de7 100644
@@ -1,7 +1,7 @@
 /*
  *	NET3:	Implementation of the ICMP protocol layer.
  *
- *		Alan Cox, <[email protected]>
+ *		Alan Cox, <[email protected]>
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License

index f70fac6..b0a33e6 100644
@@ -9,7 +9,7 @@
  *	seems to fall out with gcc 2.6.2.
  *
  *	Authors:
- *		Alan Cox <[email protected]>
+ *		Alan Cox <[email protected]>
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License

index 2152d22..e4f81f5 100644
@@ -6,7 +6,7 @@
  *		The IP fragmentation functionality.
  *
  * Authors:	Fred N. van Kempen <[email protected]>
- *		Alan Cox <[email protected]>
+ *		Alan Cox <[email protected]>
  *
  * Fixes:
  *		Alan Cox	:	Split from ip.c , see ip_input.c for history.

index e0bed56..861978a 100644
@@ -8,7 +8,7 @@
  * Authors:	Ross Biro
  *		Fred N. van Kempen, <[email protected]>
  *		Donald Becker, <[email protected]>
- *		Alan Cox, <[email protected]>
+ *		Alan Cox, <[email protected]>
  *		Richard Underwood
  *		Stefan Becker, <[email protected]>
  *		Jorge Cwik, <[email protected]>

index 4c6d2ca..29609d2 100644
@@ -41,7 +41,7 @@
 		Made the tunnels use dev->name not tunnel: when error reporting.
 		Added tx_dropped stat
 
-		-Alan Cox	([email protected]) 21 March 95
+		-Alan Cox	([email protected]) 21 March 95
 
 	Reworked:
 		Changed to tunnel to destination gateway in addition to the

index c519b8d..b42e082 100644
@@ -1,7 +1,7 @@
 /*
  *	IP multicast routing support for mrouted 3.6/3.8
  *
- *		(c) 1995 Alan Cox, <[email protected]>
+ *		(c) 1995 Alan Cox, <[email protected]>
  *	  Linux Consultancy and Custom Driver Development
  *
  *	This program is free software; you can redistribute it and/or

index 57e26fa..1c7e6fe 100644
@@ -8,7 +8,7 @@
  * Authors:	Ross Biro
  *		Fred N. van Kempen, <[email protected]>
  *		Arnt Gulbrandsen, <[email protected]>
- *		Alan Cox, <[email protected]>
+ *		Alan Cox, <[email protected]>
  *		Hirokazu Takahashi, <[email protected]>
  *
  * Fixes:

index b0eacc0..2fd8afa 100644
@@ -1,7 +1,7 @@
 /*
  * NETLINK      Kernel-user communication protocol.
  *
- * 		Authors:	Alan Cox <[email protected]>
+ * 		Authors:	Alan Cox <[email protected]>
  * 				Alexey Kuznetsov <[email protected]>
  *
  *		This program is free software; you can redistribute it and/or

index 4486c59..9a288d5 100644
@@ -3,8 +3,8 @@
  *
  * Client-side transport implementation for sockets.
  *
- * TCP callback races fixes (C) 1998 Red Hat Software <[email protected]>
- * TCP send fixes (C) 1998 Red Hat Software <[email protected]>
+ * TCP callback races fixes (C) 1998 Red Hat
+ * TCP send fixes (C) 1998 Red Hat
  * TCP NFS related read + write fixes
  *  (C) 1999 Dave Airlie, University of Limerick, Ireland <[email protected]>
  *

index 015606b..c647aab 100644
@@ -1,7 +1,7 @@
 /*
  * NET4:	Implementation of BSD Unix domain sockets.
  *
- * Authors:	Alan Cox, <[email protected]>
+ * Authors:	Alan Cox, <[email protected]>
  *
  *		This program is free software; you can redistribute it and/or
  *		modify it under the terms of the GNU General Public License

index eb9bc36..c180598 100644
@@ -1,7 +1,7 @@
 /*
  *	Initialisation code for Cyrix/NatSemi VSA1 softaudio
  *
- *	(C) Copyright 2003 Red Hat Inc <[email protected]>
+ *	(C) Copyright 2003 Red Hat Inc <[email protected]>
  *
  * XpressAudio(tm) is used on the Cyrix MediaGX (now NatSemi Geode) systems.
  * The older version (VSA1) provides fairly good soundblaster emulation

index 7ff8b68..4ba2db2 100644
@@ -2,7 +2,7 @@
  * cs5530.c - Initialisation code for Cyrix/NatSemi VSA1 softaudio
  *
  * 	(C) Copyright 2007 Ash Willis <[email protected]>
- *	(C) Copyright 2003 Red Hat Inc <[email protected]>
+ *	(C) Copyright 2003 Red Hat Inc <[email protected]>
  *
  * This driver was ported (shamelessly ripped ;) from oss/kahlua.c but I did
  * mess with it a bit. The chip seems to have to have trouble with full duplex

index 1b04259..d7f883c 100644
@@ -1,7 +1,7 @@
 /*
  *	Sound core handling. Breaks out sound functions to submodules
  *	
- *	Author:		Alan Cox <[email protected]>
+ *	Author:		Alan Cox <[email protected]>
  *
  *	Fixes:
  *

index 12b7325..a9019f0 100644
@@ -2279,9 +2279,8 @@ mptsas_delete_expander_phys(MPT_ADAPTER *ioc)
 	mutex_lock(&ioc->sas_topology_mutex);
 	list_for_each_entry_safe(port_info, n, &ioc->sas_topology, list) {
 
-		if (port_info->phy_info &&
-		    (!(port_info->phy_info[0].identify.device_info &
-		    MPI_SAS_DEVICE_INFO_SMP_TARGET)))
+		if (!(port_info->phy_info[0].identify.device_info &
+		    MPI_SAS_DEVICE_INFO_SMP_TARGET))
 			continue;
 
 		if (mptsas_sas_expander_pg0(ioc, &buffer,