From: Peter Maydell Date: Tue, 25 Mar 2014 17:49:45 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging X-Git-Tag: v2.0.0-rc1~27 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=169e4878ee96b7d6dec929e0cd400a0395865a85;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging Net patches # gpg: Signature made Tue 25 Mar 2014 15:02:48 GMT using RSA key ID 81AB73C8 # gpg: Good signature from "Stefan Hajnoczi " # gpg: aka "Stefan Hajnoczi " # 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: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha/tags/net-pull-request: net: netmap_poll must update both read/write poll state Signed-off-by: Peter Maydell --- 169e4878ee96b7d6dec929e0cd400a0395865a85