tree e0726fa2f954e829a12fe5412861d38296d07d92
parent 1a381811b495651ddfc2b50d7c8cfaaf375816b0
parent 6a86dec61921163b6ab582df988416a6f0ca0ed5
author Peter Maydell <peter.maydell@linaro.org> 1400499006 +0100
committer Peter Maydell <peter.maydell@linaro.org> 1400499006 +0100

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>