tree 150f41181a390d3d14c48c68b6ded8b3389442a9
parent ca8c0fab9504f000216308cafc833eb957fe9284
parent 5a7733b0b728bb4900bdeed12fef22651ce0ab58
author Peter Maydell <peter.maydell@linaro.org> 1400768866 +0100
committer Peter Maydell <peter.maydell@linaro.org> 1400768866 +0100

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

* remotes/bonzini/scsi-next:
  megasas: remove buildtime strings
  block: iscsi build fix if LIBISCSI_FEATURE_IOVECTOR is not defined
  virtio-scsi: Plug memory leak on virtio_scsi_push_event() error path
  scsi: Document intentional fall through in scsi_req_length()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>