Merge remote-tracking branch 'bonzini/scsi-next' into staging
commit1e2778d59d110404428627690950405577be5090
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 29 Aug 2012 13:23:18 +0000 (29 08:23 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 29 Aug 2012 13:23:18 +0000 (29 08:23 -0500)
tree0f0e4b2eb9b72d0e85105567940723cbcd35f3ee
parent7dd6f4b250772e4859997d2624ac0bbc8d02482b
parent135b9088780d7d8e5eae027b4fba6b33562f7006
Merge remote-tracking branch 'bonzini/scsi-next' into staging

* bonzini/scsi-next:
  iscsi: Set number of blocks to 0 for blank CDROM devices
  scsi: more fixes to properties for passthrough devices
  esp: support 24-bit DMA
  megasas: Add 'hba_serial' property