Merge branch 'upstream-merge'

Merge branch 'upstream-merge'

* upstream-merge: (21 commits)
  net: add queue for peer-to-peer packet forwarding
  net: refactor packet queueing code
  net: allow NICs to be connected to netdevs
  net: add -net nic,netdev= option
  net: maintain a list of vlan-less clients
  net: handle -netdevice options
  net: add -netdev option
  net: add QemuOptsList arg to net_client_parse()
  net: allow clients not associated with a vlan
  net: use qtailq for vlan and client lists
  net: remove id field from NICInfo
  net: handle id= parameter for -net
  net: remove unused qemu_handler_true()
  net: pass monitor handle to client init functions
  hotplug: safely iterate bus's sibling list while removing a device
  eepro100: Remove unused device status entries
  winwave: ADC support
  audio: remove last remnants of _t
  winwave: make error logging more consistent
  winwave: follow the rules when closing the output device
  ...

Signed-off-by: Mark McLoughlin <markmc@redhat.com>