Merge branch 'upstream-merge' into next

Merge branch 'upstream-merge' into next

* upstream-merge: (132 commits)
  vga: make Cirrus ISA device optional
  vga: improve VGA logic
  grackle_pci: Clean up qdev names
  MAINTAINERS: Add PCI-PCI bridge to New World Mac machine
  PPC: Pseries: Check for PCI boundaries
  MAINTAINERS: Add PCI host bridge files to CHRP machines
  MAINTAINERS: Add qemu-ppc to all ppc target stuff
  pseries: SLOF PCI flag day
  pseries: Use correct dispatcher for PCI config space accesses
  pseries: Support PCI extended config space in RTAS calls
  Correct types in bmdma_addr_{read,write}
  Update gitignore file
  Fix dirty logging with 32-bit qemu & 64-bit guests
  load_image_targphys() should enforce the max size
  virtio: change memcpy to guest reads
  virtio-pci: Fix endianness of virtio config
  PPC: Bamboo: Integrate SoC instatiation, use qdev for PCI
  PPC: Bamboo: fold ppc440.c and ppc440_bamboo.c into a single file
  PPC: 4xx: Qdevify the 440 PCI host controller
  PPC: bamboo: fix whitespace
  ...

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