tree 59e4e8489ef3dfbb90635b3dc9ed805b8aef973c
parent 7b2f89c435f895431d55b675dc412275c2069314
parent 07a5298c3067ed63f7d82d8c1a6f479146447289
author Anthony Liguori <aliguori@us.ibm.com> 1345660277 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1345660277 -0500

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

* bonzini/scsi-next:
  virtio-scsi: add backwards-compatibility properties for 1.1 and earlier machines
  iscsi: fix races between task completion and abort
  iscsi: simplify iscsi_schedule_bh
  iscsi: move iscsi_schedule_bh and iscsi_readv_writev_bh_cb
  Revert "iscsi: Fix NULL dereferences / races between task completion and abort"