projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97891af c97ca29)
Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 3 Apr 2014 11:24:35 +0000 (12:24 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 3 Apr 2014 11:24:35 +0000 (12:24 +0100)
* remotes/bonzini/scsi-next:
  iscsi: always query max WRITE SAME length
  iscsi: ignore flushes on scsi-generic devices
  iscsi: recognize "invalid field" ASCQ from WRITE SAME command
  scsi-bus: remove bogus assertion

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.