projects / sdk / emulator / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 76b2232 95c3df5)
Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2016-04-05' into queue...
authorKevin Wolf <kwolf@redhat.com>
Tue, 5 Apr 2016 15:31:20 +0000 (17:31 +0200)
committerKevin Wolf <kwolf@redhat.com>
Tue, 5 Apr 2016 15:31:20 +0000 (17:31 +0200)
Block patches for the 2.6 release

# gpg: Signature made Tue Apr  5 17:23:48 2016 CEST using RSA key ID E838ACAD
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"

* mreitz/tags/pull-block-for-kevin-2016-04-05:
  crypto: Avoid memory leak on failure
  qemu-iotests: 149: Use "/usr/bin/env python"

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Trivial merge
Domain: SDK / Emulator;