Merge branch 'max-sect' into upstream

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

diff --cc include/linux/libata.h
index fcdd798bb08621f890b98d518f8b65d3db8adb08,11d9febc007829f6d231b82211a79fbaa5b67c4f..2803ab8e92438453b725fce570d8afb3808ab797
--- 1/include/linux/libata.h
--- 2/include/linux/libata.h
+++ b/include/linux/libata.h
@@@ -108,10 -108,9 +108,11 @@@ enum 
        LIBATA_MAX_PRD          = ATA_MAX_PRD / 2,
        ATA_MAX_PORTS           = 8,
        ATA_DEF_QUEUE           = 1,
 -      ATA_MAX_QUEUE           = 1,
 +      /* tag ATA_MAX_QUEUE - 1 is reserved for internal commands */
 +      ATA_MAX_QUEUE           = 32,
 +      ATA_TAG_INTERNAL        = ATA_MAX_QUEUE - 1,
        ATA_MAX_SECTORS         = 200,  /* FIXME */
+       ATA_MAX_SECTORS_LBA48   = 65535,
        ATA_MAX_BUS             = 2,
        ATA_DEF_BUSY_WAIT       = 10000,
        ATA_SHORT_PAUSE         = (HZ >> 6) + 1,