Merge remote-tracking branch 'bonzini/scsi-next' into staging
commit5f580e9411a24b7decc07013edeb8abf8d5ae25c
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 14 Nov 2012 14:50:45 +0000 (14 08:50 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 14 Nov 2012 14:50:45 +0000 (14 08:50 -0600)
treeb5f0120fc2acc4080d09ecd903c647b4e8140bbd
parentce5e5b522e8d3b848b6445c34226b69c77c46403
parentdd72fdd06268860a24f9f3828efade547ee2e2a9
Merge remote-tracking branch 'bonzini/scsi-next' into staging

* bonzini/scsi-next:
  virtio-scsi: use dma_context_memory
  dma: Define dma_context_memory and use in sysbus-ohci
  megasas: Correct target/lun mapping
  scsi-disk: flush cache after disabling it
  megasas: do not include block_int.h
  scsi: remove superfluous call to scsi_device_set_ua
  virtio-scsi: factor checks for VIRTIO_SCSI_S_DRIVER_OK when reporting events
  scsi: do not return short responses for emulated commands

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
hw/usb/hcd-ohci.c