From: Peter Maydell Date: Thu, 4 Sep 2014 12:33:53 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-09-03' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=01eb313907dda97313b8fea62e5632fca64f069c;p=qemu.git Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-09-03' into staging trivial patches for 2014-09-03 # gpg: Signature made Wed 03 Sep 2014 06:53:42 BST using RSA key ID A4C3D7DB # gpg: Good signature from "Michael Tokarev " # gpg: aka "Michael Tokarev " # gpg: aka "Michael Tokarev " # 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-09-03: slirp: Honour vlan/stack in hostfwd_remove commands hmp: fix MemdevList memory leak qom/object.c, hmp.c: fix string_output_get_string() memory leak query-memdev: fix potential memory leaks MAINTAINERS: Add VMWare devices maintainer device_tree.c: dump all err mesages with error_report device_tree.c: redirect load_device_tree err message to stderr scripts: Remove scripts/qtest Fix debug print warning curl: The macro that you have to uncomment to get debugging is DEBUG_CURL. Signed-off-by: Peter Maydell --- 01eb313907dda97313b8fea62e5632fca64f069c