)]}'
{
  "commit": "d6688ba17b934f20f5e8953dbaafc9408d8799c5",
  "tree": "88f5ea991ec6a037e578ef43fe2c40e0509f39f6",
  "parents": [
    "3b730f570c5872ceea2137848f1d4554d4847441",
    "309750fad51f17d1ec6195c5d8ad7d741596ddb6"
  ],
  "author": {
    "name": "Peter Maydell",
    "email": "peter.maydell@linaro.org",
    "time": "Thu Jun 04 18:32:44 2015 +0100"
  },
  "committer": {
    "name": "Peter Maydell",
    "email": "peter.maydell@linaro.org",
    "time": "Thu Jun 04 18:33:24 2015 +0100"
  },
  "message": "Merge remote-tracking branch \u0027remotes/mst/tags/for_upstream\u0027 into staging\n\npc, acpi, virtio, tpm\n\nThis includes pxb support by Marcel, as well as multiple enhancements all over\nthe place.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\n\n# gpg: Signature made Thu Jun  4 11:51:02 2015 BST using RSA key ID D28D5469\n# gpg: Good signature from \"Michael S. Tsirkin \u003cmst@kernel.org\u003e\"\n# gpg:                 aka \"Michael S. Tsirkin \u003cmst@redhat.com\u003e\"\n\n* remotes/mst/tags/for_upstream: (28 commits)\n  vhost: logs sharing\n  hw/acpi: piix4_pm_init(): take fw_cfg object no more\n  hw/acpi: move \"etc/system-states\" fw_cfg file from PIIX4 to core\n  hw/acpi: acpi_pm1_cnt_init(): take \"disable_s3\" and \"disable_s4\"\n  pc-dimm: don\u0027t assert if pc-dimm alignment !\u003d hotpluggable mem range size\n  docs: Add PXB documentation\n  apci: fix PXB behaviour if used with unsupported BIOS\n  hw/pxb: add numa_node parameter\n  hw/pci: add support for NUMA nodes\n  hw/pxb: add map_irq func\n  hw/pci: inform bios if the system has extra pci root buses\n  hw/pci: introduce PCI Expander Bridge (PXB)\n  hw/pci: removed \u0027rootbus nr is 0\u0027 assumption from qmp_pci_query\n  hw/acpi: remove from root bus 0 the crs resources used by other buses.\n  hw/acpi: add _CRS method for extra root busses\n  hw/apci: add _PRT method for extra PCI root busses\n  hw/acpi: add support for i440fx \u0027snooping\u0027 root busses\n  hw/pci: extend PCI config access to support devices behind PXB\n  hw/i386: query only for q35/pc when looking for pci host bridge\n  hw/pci: made pci_bus_num a PCIBusClass method\n  ...\n\nConflicts:\n\thw/i386/pc_piix.c\n\nSigned-off-by: Peter Maydell \u003cpeter.maydell@linaro.org\u003e\n",
  "tree_diff": []
}