From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 28 Apr 2014 10:29:02 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
X-Git-Tag: qemu-xen-4.6.0-rc1~491
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d09a18d44d5bc0db10caa97cdd22c70e65adfe01;p=qemu-upstream-unstable.git

Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging

Net patches

# gpg: Signature made Fri 25 Apr 2014 15:07:31 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/net-pull-request:
  net: Don't use error_is_set() to suppress additional errors
  net: Make qmp_query_rx_filter() with name argument more obvious
  net: xilinx_axienet.c: Add phy soft reset bit clearing
  net/net.c: Remove unnecessary semicolon
  pcnet: remove duplicate assignment
  tap: Avoid extra iterations while closing file fd

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

d09a18d44d5bc0db10caa97cdd22c70e65adfe01