From: Peter Maydell Date: Fri, 13 Mar 2015 11:00:57 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging X-Git-Tag: v2.3.0-rc0~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82389dcc133d9d6aa3418fbbb59d784dd8d0e88c;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging # gpg: Signature made Thu Mar 12 20:06:50 2015 GMT using RSA key ID 81AB73C8 # gpg: Good signature from "Stefan Hajnoczi " # gpg: aka "Stefan Hajnoczi " * remotes/stefanha/tags/net-pull-request: tests: rtl8139: test timers and interrupt net: synchronize net_host_device_remove with host_net_remove_completion Signed-off-by: Peter Maydell --- 82389dcc133d9d6aa3418fbbb59d784dd8d0e88c