From: Jeff Garzik <jeff@garzik.org>
Date: Mon, 12 Jun 2006 03:04:37 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: v2.6.18-rc1~1079^2~35
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=fec69a97489f961026e24536dbb7b86ac663948c;p=linux.git

Merge branch 'upstream-fixes' into upstream

Conflicts:

	drivers/scsi/sata_sil24.c
---

fec69a97489f961026e24536dbb7b86ac663948c
diff --cc drivers/scsi/sata_mv.c
index 634bab17a6bb,f16f92a6ec0f..4a71578df3c1
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@@ -2040,8 -2035,9 +2040,9 @@@ static void mv_phy_reset(struct ata_por
  static void mv_eng_timeout(struct ata_port *ap)
  {
  	struct ata_queued_cmd *qc;
+ 	unsigned long flags;
  
 -	printk(KERN_ERR "ata%u: Entering mv_eng_timeout\n",ap->id);
 +	ata_port_printk(ap, KERN_ERR, "Entering mv_eng_timeout\n");
  	DPRINTK("All regs @ start of eng_timeout\n");
  	mv_dump_all_regs(ap->host_set->mmio_base, ap->port_no,
  			 to_pci_dev(ap->host_set->dev));