]> git.proxmox.com Git - qemu.git/commit
projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5a34dbb 372254c)
Merge remote-tracking branch 'stefanha/net' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 1 Nov 2012 16:13:59 +0000 (11:13 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 1 Nov 2012 16:13:59 +0000 (11:13 -0500)
commitd971919f08ca300e7b3595a4c5ddaea2ce8fc3ba
tree4bef68afad713ada32f674e232b496fc62dca073tree
parent5a34dbb55994ddb8e3f4cc465abbb85aa2e6dfafcommit | diff
parent372254c6e5c078fb13b236bb648d2b9b2b0c70f1commit | diff
Merge remote-tracking branch 'stefanha/net' into staging

* stefanha/net:
  e1000: pre-initialize RAH/RAL registers
  net: Reject non-netdevs in qmp_netdev_del()
  net: use "socket" model name for UDP sockets
  e1000: drop check_rxov, always treat RX ring with RDH == RDT as empty

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Qemu copy for testing