Merge branch 'upstream-linus2' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus2' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] sata_nv: undo merge error

drivers/ata/sata_nv.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -307,7 +307,6 @@ static struct scsi_host_template nv_sht = {
		.name = DRV_NAME,
		.ioctl = ata_scsi_ioctl,
		.queuecommand = ata_scsi_queuecmd,
		.change_queue_depth = ata_scsi_change_queue_depth,
		.can_queue = ATA_DEF_QUEUE,
		.this_id = ATA_SHT_THIS_ID,
		.sg_tablesize = LIBATA_MAX_PRD,