diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2016-04-15 17:59:42 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-04-15 17:59:42 +0200 |
| commit | cdc8845331cf789636dfa88dc47e22fcdaef4057 (patch) | |
| tree | cb982c9869a1919426e1b74366f5788c744bea31 /hw/misc/macio/cuda.c | |
| parent | 90c647db8d59e47c9000affc0d81754eb346e939 (diff) | |
| parent | d1129a8ad96af6bc47404490769a637bcd860493 (diff) | |
| download | focaccia-qemu-cdc8845331cf789636dfa88dc47e22fcdaef4057.tar.gz focaccia-qemu-cdc8845331cf789636dfa88dc47e22fcdaef4057.zip | |
Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2016-04-15' into queue-block
Block patches for 2.6.0-rc3. # gpg: Signature made Fri Apr 15 17:57:30 2016 CEST using RSA key ID E838ACAD # gpg: Good signature from "Max Reitz <mreitz@redhat.com>" * mreitz/tags/pull-block-for-kevin-2016-04-15: nbd: Don't kill server on client that doesn't request TLS nbd: fix assert() on qemu-nbd stop nbd: Don't fail handshake on NBD_OPT_LIST descriptions qemu-iotests: 041: More robust assertion on quorum node qemu-iotests: place valgrind log file in scratch dir qemu-iotests: tests: do not set unused tmp variable qemu-iotests: common.rc: drop unused _do() qemu-iotests: drop unused _within_tolerance() filter Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/misc/macio/cuda.c')
0 files changed, 0 insertions, 0 deletions