)]}'
{
  "commit": "e2848a78b0a6715f94623bdf43ef74d3d08cfe4d",
  "tree": "6c9f6a0ee2ee6d4ba57795e8c13a1cd7cd5ddd97",
  "parents": [
    "80ec24328607937690d0d620b99e8c24ab29e8f5",
    "7e973bb2e17f929f47376a3872f7ccdff25a51ab"
  ],
  "author": {
    "name": "Anthony Liguori",
    "email": "aliguori@us.ibm.com",
    "time": "Fri Jan 11 08:36:52 2013 -0600"
  },
  "committer": {
    "name": "Anthony Liguori",
    "email": "aliguori@us.ibm.com",
    "time": "Fri Jan 11 08:43:08 2013 -0600"
  },
  "message": "Merge remote-tracking branch \u0027kraxel/q35.1\u0027 into staging\n\n* kraxel/q35.1:\n  Makefile: install the \"acpi-dsdt.aml\" and \"q35-acpi-dsdt.aml\" blobs too\n  pc: rename machine types\n  q35: document chipset devices\n  q35: add ich9 intel hda controller\n\nConflicts:\n\thw/intel-hda.c\n\naliguori: resolve conflict with static const change from Andreas.\n\nSigned-off-by: Anthony Liguori \u003caliguori@us.ibm.com\u003e\n",
  "tree_diff": []
}
