From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 3 Aug 2012 20:46:17 +0000 (-0500)
Subject: Merge remote-tracking branch 'bonzini/scsi-next' into staging
X-Git-Tag: v2.7.1~4751
X-Git-Url: https://git.proxmox.com/?p=mirror_qemu.git;a=commitdiff_plain;h=b34bd5e5c8f356ec206e5a306ee3a9b6f42c4315

Merge remote-tracking branch 'bonzini/scsi-next' into staging

* bonzini/scsi-next:
  scsi: add support for ATA_PASSTHROUGH_xx scsi command
  esp: add missing const on TypeInfo structures
  esp: enable for all PCI machines
  Revert "megasas: disable due to build breakage"
  megasas: static SAS addresses
  scsi-disk: fix compilation with DEBUG_SCSI
  megasas: Update function megasys_scsi_uninit
  SCSI: STARTSTOPUNIT only eject/load media if powercondition is 0
  SCSI: Update the sense code for PREVENT REMOVAL errors
---

b34bd5e5c8f356ec206e5a306ee3a9b6f42c4315