Merge commit 'f5e6fed879ae10b9f6494a6eed21c1979391d7cb' into upstream-merge

Merge commit 'f5e6fed879ae10b9f6494a6eed21c1979391d7cb' into upstream-merge

* commit 'f5e6fed879ae10b9f6494a6eed21c1979391d7cb': (40 commits)
  pci: add pci_address_space()
  isa: add isa_address_space()
  sysbus: remove sysbus_init_mmio_cb()
  ppce500_pci: convert to sysbus_init_mmio_cb2()
  versatile_pci: convert to memory API
  arm11mpcore: use sysbus_init_mmio_cb2
  sh_pci: convert to memory API
  sysbus: add a variant of sysbus_init_mmio_cb with an unmap callback
  ppc4xx_sdram: convert to memory API
  ppc405_uc: convert to memory API
  pcie_host: convert to memory API
  onenand: convert to memory API
  omap_gpmc/nseries/tusb6010: convert to memory API
  tusb6010: move declarations to new file tusb6010.h
  gt64xxx.c: convert to memory API
  armv7m: convert to memory API
  arm_timer: convert to memory API
  arm_sysctl: convert to memory API
  arm_gic: convert to memory API
  apic: convert to memory API
  ...

Conflicts:
	hw/pci.h

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