From: Peter Maydell Date: Wed, 23 Dec 2015 13:29:47 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8b4f90316a56dc370da94a04838a5c0a7d61d41f;p=qmiga%2Fqemu.git Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging Fix a 2.5 regression. # gpg: Signature made Wed 23 Dec 2015 10:57:00 GMT using DSA key ID 0101DBC2 # gpg: Good signature from "Greg Kurz " # gpg: aka "Greg Kurz " # gpg: aka "Greg Kurz " # gpg: aka "Gregory Kurz (Groug) " # gpg: aka "Gregory Kurz (Cimai Technology) " # gpg: aka "Gregory Kurz (Meiosys Technology) " # 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: 2BD4 3B44 535E C0A7 9894 DBA2 02FC 3AEB 0101 DBC2 * remotes/gkurz/tags/for-upstream: virtio-9p: use accessor to get thread_pool Signed-off-by: Peter Maydell --- 8b4f90316a56dc370da94a04838a5c0a7d61d41f