From: Peter Maydell Date: Fri, 13 Jun 2014 15:07:04 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-trivial-20140613-1' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=80008a6a298104e25d1b806b673eccc5ff58d1aa;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/pull-trivial-20140613-1' into staging inet_listen_opts: add error checking # gpg: Signature made Fri 13 Jun 2014 12:29:43 BST using RSA key ID D3E87138 # gpg: Good signature from "Gerd Hoffmann (work) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " * remotes/kraxel/tags/pull-trivial-20140613-1: inet_listen_opts: add error checking Signed-off-by: Peter Maydell --- 80008a6a298104e25d1b806b673eccc5ff58d1aa