Merge branch 'upstream-merge'

Merge branch 'upstream-merge'

* upstream-merge: (218 commits)
  musicpal: intermediate merge fixup
  stellaris_enet: intermediate merge fixup
  xilinx_ethlite: intermediate merge fixup
  smc91c111: intermediate merge fixup
  eepro100: intermediate merge fixup
  virtio: intermediate merge fixup
  rtl8139: intermediate merge fixup
  pcnet: intermediate merge fixup
  e1000: intermediate merge fixup
  ne2k_pci: intermediate merge fixup
  ne2k_isa: intermediate merge fixup
  Revert "char: emit the OPENED event only when a new char connection is opened"
  really fix net.h
  Fix signature of new_vlan_client
  virtio-net: add tap_has_ufo flag to saved state
  Enable UFO on virtio-net and tap devices
  Work around dhclient brokenness
  virtio-net: enable tap offload if guest supports it
  net: add tap_set_offload()
  virtio-net: add vnet_hdr support
  ...

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