diff options
author | Peter Maydell | 2014-03-26 17:17:36 +0100 |
---|---|---|
committer | Peter Maydell | 2014-03-26 17:17:36 +0100 |
commit | 61898bc020c3367c629a99a2abdaa1c60fce76cd (patch) | |
tree | 11d3deb3441871402760f56a2e25edb5d1bbfca1 /hw/arm/integratorcp.c | |
parent | Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (diff) | |
parent | spapr_vscsi: remove duplicate condition check (diff) | |
download | qemu-61898bc020c3367c629a99a2abdaa1c60fce76cd.tar.gz qemu-61898bc020c3367c629a99a2abdaa1c60fce76cd.tar.xz qemu-61898bc020c3367c629a99a2abdaa1c60fce76cd.zip |
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>
Diffstat (limited to 'hw/arm/integratorcp.c')
0 files changed, 0 insertions, 0 deletions