Merge branch 'upstream-fixes' into upstream

diff --cc drivers/ata/ata_piix.c
Simple merge

diff --cc drivers/ata/sata_via.c
index 6529189,01d4036..a0699a1
--- 1/drivers/ata/sata_via.c
--- 2/drivers/scsi/sata_via.c
+++ b/drivers/ata/sata_via.c
@@@ -74,9 -74,9 +74,10 @@@ enum 
  static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
  static u32 svia_scr_read (struct ata_port *ap, unsigned int sc_reg);
  static void svia_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
+ static void vt6420_error_handler(struct ata_port *ap);
  
  static const struct pci_device_id svia_pci_tbl[] = {
 +      { 0x1106, 0x0591, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6420 },
        { 0x1106, 0x3149, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6420 },
        { 0x1106, 0x3249, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6421 },