]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'stefanha/net' into staging
authorAnthony Liguori <aliguori@amazon.com>
Fri, 18 Oct 2013 17:02:48 +0000 (10:02 -0700)
committerAnthony Liguori <aliguori@amazon.com>
Fri, 18 Oct 2013 17:02:48 +0000 (10:02 -0700)
# By Amos Kong
# Via Stefan Hajnoczi
* stefanha/net:
  net/rtl8139: update network information when macaddr is changed in guest
  net/e1000: update network information when macaddr is changed in guest
  net: update nic info during device reset

Message-id: 1382103314-21608-1-git-send-email-stefanha@redhat.com
Signed-off-by: Anthony Liguori <aliguori@amazon.com>

Trivial merge