From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 22 Aug 2012 18:31:17 +0000 (-0500)
Subject: Merge remote-tracking branch 'bonzini/scsi-next' into staging
X-Git-Tag: v1.2.0-rc1~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a9b670b139ed381bd07df08bdfdcb515dff3ca8c;p=thirdparty%2Fqemu.git

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"
---

a9b670b139ed381bd07df08bdfdcb515dff3ca8c