Merge branch 'upstream-merge'

Merge branch 'upstream-merge'

* upstream-merge: (60 commits)
  etraxfs_eth: correct use of ! and &
  Sparc: update OpenBIOS images to r859
  ppc4xx: load Bamboo kernel, initrd, and fdt at fixed addresses
  ppc4xx: don't unregister RAM at reset
  ppc4xx: correct SDRAM controller warning message condition
  Fix "make install" with a cross toolchain
  PPC: Update openbios binary to r859
  PPC: Add PV hypercall transport through fw_cfg
  Rearrange block headers
  QemuOpts: make most qemu_*_opts static
  compile -fsdev and -virtfs cmd line options unconditionally.
  QemuOpts: allow new option groups be registered at runtime.
  VGA: Don't register deprecated VBE range
  QMP: Update README file
  QMP doc: Add 'Stability Considerations' section
  QMP/monitor: update do_info_version() to output broken down version string
  QMP: update 'query-version' documentation
  vnc: check fd before calling qemu_set_fd_handler2() in vnc_client_write()
  exec: remove code duplication in qemu_ram_alloc() and qemu_ram_alloc_from_ptr()
  virtio-serial: Cleanup on device hot-unplug
  ...

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>