]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 26 Mar 2014 16:17:36 +0000 (16:17 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 26 Mar 2014 16:17:36 +0000 (16:17 +0000)
commit61898bc020c3367c629a99a2abdaa1c60fce76cd
tree11d3deb3441871402760f56a2e25edb5d1bbfca1
parent0a87466ef3fe3d9a062195f801727569ab886bde
parentec8929a55512606456e364ffa80586219f67c904
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 <peter.maydell@linaro.org>