diff options
| author | Peter Maydell | 2016-04-05 18:03:32 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-04-05 18:03:32 +0200 |
| commit | 31370dbe5d68d146b8802933587d5341438646f0 (patch) | |
| tree | 46cb4c6dd3d800a45827cb9a00820764d3e25931 /qemu-char.c | |
| parent | Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2016-04-05-1... (diff) | |
| parent | Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2016-04-05' in... (diff) | |
| download | qemu-31370dbe5d68d146b8802933587d5341438646f0.tar.gz qemu-31370dbe5d68d146b8802933587d5341438646f0.tar.xz qemu-31370dbe5d68d146b8802933587d5341438646f0.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches for 2.6
# gpg: Signature made Tue 05 Apr 2016 16:32:25 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
crypto: Avoid memory leak on failure
qemu-iotests: 149: Use "/usr/bin/env python"
block: Forbid I/O throttling on nodes with multiple parents for 2.6
block: forbid x-blockdev-del from acting on DriveInfo
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-char.c')
0 files changed, 0 insertions, 0 deletions