Merge branch 'upstream'

diff --cc drivers/scsi/libata-core.c
Simple merge

diff --cc include/linux/libata.h
index 1be43be,46337e7..b77f156
--- 1/include/linux/libata.h
--- 2/include/linux/libata.h
+++ b/include/linux/libata.h
@@@ -134,8 -133,10 +134,12 @@@ enum 
        ATA_TMOUT_PIO           = 30 * HZ,
        ATA_TMOUT_BOOT          = 30 * HZ,      /* hueristic */
        ATA_TMOUT_BOOT_QUICK    = 7 * HZ,       /* hueristic */
 +      ATA_TMOUT_DATAOUT       = 30 * HZ,
 +      ATA_TMOUT_DATAOUT_QUICK = 5 * HZ,
+       ATA_TMOUT_CDB           = 30 * HZ,
+       ATA_TMOUT_CDB_QUICK     = 5 * HZ,
+       ATA_TMOUT_INTERNAL      = 30 * HZ,
+       ATA_TMOUT_INTERNAL_QUICK = 5 * HZ,
  
        /* ATA bus states */
        BUS_UNKNOWN             = 0,