tree 6ddc5b835994a9d2fc463b914211b1bebf70f609
parent 806f352d3d6f7b326b0ab3a49c622b124459dc8d
parent af347aa5a521555f5342e67993eb717d4f542ba8
author Anthony Liguori <aliguori@us.ibm.com> 1362406806 -0600
committer Anthony Liguori <aliguori@us.ibm.com> 1362406806 -0600

Merge remote-tracking branch 'stefanha/net' into staging

# By Jason Wang (2) and others
# Via Stefan Hajnoczi
* stefanha/net:
  qmp: netdev_add is like -netdev, not -net, fix documentation
  doc: document -netdev hubport
  net: reduce the unnecessary memory allocation of multiqueue
  tap: set IFF_ONE_QUEUE per default
  tap: forbid creating multiqueue tap when hub is used
  net: fix unbounded NetQueue
  net: fix qemu_flush_queued_packets() in presence of a hub