)]}'
{
  "commit": "edab95103d3a1eb5e3faf977eae4ad0b5bf5669c",
  "tree": "812c111f94b0ae31bf88b49e7c37a7f5ba353eef",
  "parents": [
    "e5fca243abae1445afbfceebda5f08462ef869d3",
    "b36824c75c7855585d6476eef2b234f6e0e68872"
  ],
  "author": {
    "name": "Tejun Heo",
    "email": "tj@kernel.org",
    "time": "Fri Nov 22 18:32:25 2013 -0500"
  },
  "committer": {
    "name": "Tejun Heo",
    "email": "tj@kernel.org",
    "time": "Fri Nov 22 18:32:25 2013 -0500"
  },
  "message": "cgroup: Merge branch \u0027memcg_event\u0027 into for-3.14\n\nMerge v3.12 based patch series to move cgroup_event implementation to\nmemcg into for-3.14.  The following two commits cause a conflict in\nkernel/cgroup.c\n\n  2ff2a7d03bbe4 (\"cgroup: kill css_id\")\n  79bd9814e5ec9 (\"cgroup, memcg: move cgroup_event implementation to memcg\")\n\nEach patch removes a struct definition from kernel/cgroup.c.  As the\ntwo are adjacent, they cause a context conflict.  Easily resolved by\nremoving both structs.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n",
  "tree_diff": []
}