]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f42ac8 a245fc1)
Merge remote-tracking branch 'stefanha/net' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 12 Oct 2012 14:14:04 +0000 (09:14 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 12 Oct 2012 14:14:04 +0000 (09:14 -0500)
* stefanha/net:
  net: consolidate NetClientState header files into one
  virtio-net: update nc.link_down in virtio_net_load()
  e1000: update nc.link_down in e1000_post_load()
  rtl8139: implement 8139cp link status


Trivial merge
Qemu copy for testing