)]}'
{
  "commit": "d326f44e5f2204c7a24db69bfc6dd3fe5f86182b",
  "tree": "21473db646b06fd462bbc8f3690732ba1bb2d018",
  "parents": [
    "ec612fcf43e09f5e05d37baf4d3f138b3fcc2f3d",
    "e840dfe334b4791af07aadee1b2cf3c7c7363581"
  ],
  "author": {
    "name": "Len Brown",
    "email": "len.brown@intel.com",
    "time": "Fri Mar 30 16:35:53 2012 -0400"
  },
  "committer": {
    "name": "Len Brown",
    "email": "len.brown@intel.com",
    "time": "Fri Mar 30 16:38:59 2012 -0400"
  },
  "message": "Merge branch \u0027tboot\u0027 into release\n\nConflicts:\n\tdrivers/acpi/acpica/hwsleep.c\n\nText conflict between:\n\n2feec47d4c5f80b05f1650f5a24865718978eea4\n(ACPICA: ACPI 5: Support for new FADT SleepStatus, SleepControl registers)\n\nwhich removed #include \"actables.h\"\n\nand\n\n09f98a825a821f7a3f1b162f9ed023f37213a63b\n(x86, acpi, tboot: Have a ACPI os prepare sleep instead of calling tboot_sleep.)\n\nwhich removed #include \u003clinux/tboot.h\u003e\n\nThe resolution is to remove them both.\n\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n",
  "tree_diff": []
}