From: Peter Maydell Date: Wed, 26 Mar 2014 16:17:36 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=61898bc020c3367c629a99a2abdaa1c60fce76cd;p=qemu.git Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging * remotes/bonzini/scsi-next: spapr_vscsi: remove duplicate condition check scsi: check req pointer before dereferencing it Signed-off-by: Peter Maydell --- 61898bc020c3367c629a99a2abdaa1c60fce76cd