Merge remote-tracking branch 'bonzini/scsi-next' into staging
commita9b670b139ed381bd07df08bdfdcb515dff3ca8c
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 22 Aug 2012 18:31:17 +0000 (22 13:31 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 22 Aug 2012 18:31:17 +0000 (22 13:31 -0500)
tree59e4e8489ef3dfbb90635b3dc9ed805b8aef973c
parent7b2f89c435f895431d55b675dc412275c2069314
parent07a5298c3067ed63f7d82d8c1a6f479146447289
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"
hw/pc_piix.c