Merge upstream kernel into libata 'passthru' branch

diff --cc drivers/scsi/libata-scsi.c
index 3ba1fefb8374bb7b0d6cbf8a9e783ba310d728dc,346eb36b1e31e0c5665269077e65ef4f11149644..a980701d06c773de0689e7bee532017748bf2b4b
--- 1/drivers/scsi/libata-scsi.c
--- 2/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@@ -1877,10 -1510,8 +1953,13 @@@ static inline ata_xlat_func_t ata_get_x
        case VERIFY:
        case VERIFY_16:
                return ata_scsi_verify_xlat;
 +
 +      case ATA_12:
 +      case ATA_16:
 +              return ata_scsi_pass_thru;
++
+       case START_STOP:
+               return ata_scsi_start_stop_xlat;
        }
  
        return NULL;

diff --cc drivers/scsi/libata.h
Simple merge