Merge commit '78207d80a3d4ed80bca57a67a195a18cc70153bb' into upstream-merge

Merge commit '78207d80a3d4ed80bca57a67a195a18cc70153bb' into upstream-merge

* commit '78207d80a3d4ed80bca57a67a195a18cc70153bb':
  jazz-led: compile it only twice
  jazz-led: convert to QOM
  jazz-led: use trace framework
  qom: Fix object_initialize_with_type() assertion
  pci: set memory type for memory behind the bridge
  pci: add accessors to get/set registers by mask
  qom: Document ways to retrieve child object added by object_property_add_child()
  pc_piix/pc_sysfw: enable flash by default
  hw/pc_piix: add pc-1.1
  hw/pc_piix: remove is_default for pc-0.15
  hw/pc_sysfw: support system flash memory with pflash
  hw/pc_sysfw: enable pc-sysfw as a qdev

Conflicts:
	Makefile.target

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