From: Peter Maydell Date: Tue, 23 Jun 2015 17:25:55 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-06-23' into... X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~209^2~98 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=355df30554445c043a12168e9c5f912742050548;p=sdk%2Femulator%2Fqemu.git Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-06-23' into staging trivial patches for 2015-06-23 # gpg: Signature made Tue Jun 23 18:23:45 2015 BST using RSA key ID A4C3D7DB # gpg: Good signature from "Michael Tokarev " # gpg: aka "Michael Tokarev " # gpg: aka "Michael Tokarev " * remotes/mjt/tags/pull-trivial-patches-2015-06-23: (21 commits) util/qemu-sockets: improve ai_flag hints for ipv6 hosts hw/display/tcx.c: Fix memory leak hw/display/cg3.c: Fix memory leak Makefile: Add "make ctags" Makefile: Fix "make cscope TAGS" qemu-options: Use @itemx where appropriate qemu-options: Improve -global documentation throttle: Fix typo in the documentation of block_set_io_throttle hw/display/qxl-logger.c: Constify some variable configure: rearrange --help and consolidate enable/disable together libcacard: pkgconfig: tidy dependent libs vt82c686: QOMify xen_pt: QOMify wdt_i6300esb: QOMify piix4: QOMify piix: piix3 QOMify pci-assign: QOMify Print error when failing to load PCI config data Grammar: 'as to'->'as for' remove libdecnumber/dpd/decimal128Local.h ... Signed-off-by: Peter Maydell --- 355df30554445c043a12168e9c5f912742050548