)]}'
{
  "commit": "26edf8cc08e2ec15d9e65bb0dd4fbac22edd730b",
  "tree": "a010815e0435a73d2a6347b5b75ee3f6ece1c788",
  "parents": [
    "31e25e3e5701607a2a88b5b6c5fb1057b20941fd",
    "711e2f1e9ecad845e142fdddbbf1e8037bce902b"
  ],
  "author": {
    "name": "Peter Maydell",
    "email": "peter.maydell@linaro.org",
    "time": "Thu Jun 05 21:52:37 2014 +0100"
  },
  "committer": {
    "name": "Peter Maydell",
    "email": "peter.maydell@linaro.org",
    "time": "Thu Jun 05 21:52:37 2014 +0100"
  },
  "message": "Merge remote-tracking branch \u0027remotes/mst/tags/for_upstream\u0027 into staging\n\npc,pci,virtio,qdev fixes, tests\n\nnew tests for SMBIOS\nSMBIOS fixes\npc, pci fixes\nqdev patches stayed on list for a month with no review,\nas I told people on KVM forum I\u0027m merging stuch patches\nif they look fine.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\n\n* remotes/mst/tags/for_upstream:\n  qdev: Add test of qdev_prop_check_global\n  qdev: Display warning about unused -global\n  tests: add smbios testing\n  tests: rename acpi-test to bios-tables-test\n  virtio-balloon: return empty data when no stats are available\n  pcie_host: Turn pcie_host_init() into an instance_init\n  SMBIOS: Fix type 17 field sizes\n  SMBIOS: Update Type 0 struct generator for machines \u003e\u003d 2.1\n  SMBIOS: Fix endian-ness when populating multi-byte fields\n  serial-pci: Set prog interface field of pci config to 16550 compatible\n\nConflicts:\n\tinclude/hw/i386/pc.h\n[PMM: fixed trivial conflict in pc.h]\nSigned-off-by: Peter Maydell \u003cpeter.maydell@linaro.org\u003e\n",
  "tree_diff": []
}
