Merge redhat.com:/spare/repo/linux-2.5

into redhat.com:/spare/repo/libata-2.5

drivers/scsi/libata-core.c

@@ -969,7 +969,7 @@ static void ata_dev_identify(struct ata_port *ap, unsigned int device)
 		printk(KERN_INFO "ata%u: dev %u ATA, max %s, %Lu sectors%s\n",
 		       ap->id, device,
 		       ata_udma_string(udma_modes),
-		       dev->n_sectors,
+		       (unsigned long long)dev->n_sectors,
 		       dev->flags & ATA_DFLAG_LBA48 ? " (lba48)" : "");
 	}