diff options
| author | Peter Maydell | 2014-07-28 12:05:14 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-07-28 12:05:14 +0200 |
| commit | f45c56e0166e86d3b309ae72f4cb8e3d0949c7ef (patch) | |
| tree | a9a0eee5c92d7eb38c7720c07f173e06429680a7 /qapi-schema.json | |
| parent | Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (diff) | |
| parent | qemu-options: fix another allows-to for -net l2tpv3 (diff) | |
| download | qemu-f45c56e0166e86d3b309ae72f4cb8e3d0949c7ef.tar.gz qemu-f45c56e0166e86d3b309ae72f4cb8e3d0949c7ef.tar.xz qemu-f45c56e0166e86d3b309ae72f4cb8e3d0949c7ef.zip | |
Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-07-26' into staging
trivial patches for 2014-07-26
# gpg: Signature made Sat 26 Jul 2014 08:16:55 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5
# Subkey fingerprint: 6F67 E18E 7C91 C5B1 5514 66A7 BEE5 9D74 A4C3 D7DB
* remotes/mjt/tags/trivial-patches-2014-07-26:
qemu-options: fix another allows-to for -net l2tpv3
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi-schema.json')
0 files changed, 0 insertions, 0 deletions