Merge branch 'upstream-fixes' into upstream

Conflicts:

	drivers/scsi/sata_sil24.c

diff --cc drivers/scsi/sata_mv.c
index 634bab17a6bb888c1e569b9a84118713b3ac6c63,f16f92a6ec0fe468da2c87363227015e0f27a061..4a71578df3c1ce24d8e9a34338d9eb87395a8430
--- 1/drivers/scsi/sata_mv.c
--- 2/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));

diff --cc drivers/scsi/scsi_lib.c
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge