)]}'
{
  "commit": "394efd19d5fcae936261bd48e5b33b21897aacf8",
  "tree": "c48cf3ddbb07fd87309f1abdf31a27c71330e587",
  "parents": [
    "f421436a591d34fa5279b54a96ac07d70250cc8d",
    "be408cd3e1fef73e9408b196a79b9934697fe3b1"
  ],
  "author": {
    "name": "David S. Miller",
    "email": "davem@davemloft.net",
    "time": "Mon Nov 04 13:48:30 2013 -0500"
  },
  "committer": {
    "name": "David S. Miller",
    "email": "davem@davemloft.net",
    "time": "Mon Nov 04 13:48:30 2013 -0500"
  },
  "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tdrivers/net/ethernet/emulex/benet/be.h\n\tdrivers/net/netconsole.c\n\tnet/bridge/br_private.h\n\nThree mostly trivial conflicts.\n\nThe net/bridge/br_private.h conflict was a function signature (argument\naddition) change overlapping with the extern removals from Joe Perches.\n\nIn drivers/net/netconsole.c we had one change adjusting a printk message\nwhilst another changed \"printk(KERN_INFO\" into \"pr_info(\".\n\nLastly, the emulex change was a new inline function addition overlapping\nwith Joe Perches\u0027s extern removals.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n",
  "tree_diff": []
}