From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 19 May 2014 11:30:06 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging
X-Git-Tag: v2.1.0-rc0~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a23082b4eca28df6a26efae8016d2f2f0921da5;p=thirdparty%2Fqemu.git

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

* remotes/bonzini/scsi-next:
  [PATCH] block/iscsi: bump year in copyright notice
  block/iscsi: allow cluster_size of 4K and greater
  block/iscsi: clarify the meaning of ISCSI_CHECKALLOC_THRES
  block/iscsi: speed up read for unallocated sectors
  block/iscsi: allow fall back to WRITE SAME without UNMAP
  MAINTAINERS: mark megasas as maintained
  megasas: Add MSI support
  megasas: Enable MSI-X support
  megasas: Implement LD_LIST_QUERY
  scsi: Improve error messages more
  scsi-disk: Improve error messager if can't get version number

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

6a23082b4eca28df6a26efae8016d2f2f0921da5