OSDN Git Service

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)
* 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>

Trivial merge