)]}'
{
  "commit": "d9c5841e22231e4e49fd0a1004164e6fce59b7a6",
  "tree": "e1f589c46b3ff79bbe7b1b2469f6362f94576da6",
  "parents": [
    "b701a47ba48b698976fb2fe05fb285b0edc1d26a",
    "5967ed87ade85a421ef814296c3c7f182b08c225"
  ],
  "author": {
    "name": "H. Peter Anvin",
    "email": "hpa@zytor.com",
    "time": "Thu Apr 29 16:53:17 2010 -0700"
  },
  "committer": {
    "name": "H. Peter Anvin",
    "email": "hpa@zytor.com",
    "time": "Thu Apr 29 16:53:17 2010 -0700"
  },
  "message": "Merge branch \u0027x86/asm\u0027 into x86/atomic\n\nMerge reason:\n\tConflict between LOCK_PREFIX_HERE and relative alternatives\n\tpointers\n\nResolved Conflicts:\n\tarch/x86/include/asm/alternative.h\n\tarch/x86/kernel/alternative.c\n\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n",
  "tree_diff": []
}
