Merge branch 'upstream-merge' into next

Merge branch 'upstream-merge' into next

* upstream-merge: (61 commits)
  qom: Unify type registration
  device_add: don't add a /peripheral link until init is complete
  qdev: print error message before aborting
  qdev: allow setting properties to NULL
  ppc: remove unused variables
  cfi02: Fix lazy ROMD switching - once again
  memory-region: Report if region is read-only or write-only on info mtree
  vga: Fix full updates in graphic mode
  Fix memory dirty getting API change fallout
  xhci: handle USB_RET_NAK
  xhci: remote wakeup support
  xhci: kill port arg from xhci_setup_packet
  xhci: stop on errors
  xhci: add trb type name lookup support.
  xhci: signal low- and fullspeed support
  usb: add USBBusOps->wakeup_endpoint
  usb: pass USBEndpoint to usb_wakeup
  usb: maintain async packet list per endpoint
  usb: Set USBEndpoint in usb_packet_setup().
  usb: add USBEndpoint->{nr,pid}
  ...

Signed-off-by: Avi Kivity <avi@redhat.com>