)]}'
{
  "commit": "af37501c792107c2bde1524bdae38d9a247b841a",
  "tree": "b50ee90d29e72956b8b7d8d19677fe5996755d49",
  "parents": [
    "d859e29fe34cb833071b20aef860ee94fbad9bb2",
    "99937d6455cea95405ac681c86a857d0fcd530bd"
  ],
  "author": {
    "name": "Ingo Molnar",
    "email": "mingo@elte.hu",
    "time": "Sun Jan 18 18:15:49 2009 +0100"
  },
  "committer": {
    "name": "Ingo Molnar",
    "email": "mingo@elte.hu",
    "time": "Sun Jan 18 18:15:49 2009 +0100"
  },
  "message": "Merge branch \u0027core/percpu\u0027 into perfcounters/core\n\nConflicts:\n\tarch/x86/include/asm/pda.h\n\nWe merge tip/core/percpu into tip/perfcounters/core because of a\nsemantic and contextual conflict: the former eliminates the PDA,\nwhile the latter extends it with apic_perf_irqs field.\n\nResolve the conflict by moving the new field to the irq_cpustat\nstructure on 64-bit too.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n",
  "tree_diff": []
}
