Merge remote-tracking branch 'bonzini/scsi-next' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 29 Aug 2012 13:23:18 +0000 (08:23 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 29 Aug 2012 13:23:18 +0000 (08:23 -0500)
* 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


Trivial merge