)]}'
{
  "commit": "6e0895c2ea326cc4bb11e8fa2f654628d5754c31",
  "tree": "7089303ac11a12edc43a8c4fa1b23974e10937ea",
  "parents": [
    "55fbbe46e9eb3cbe6c335503f5550855a1128dce",
    "60d509fa6a9c4653a86ad830e4c4b30360b23f0e"
  ],
  "author": {
    "name": "David S. Miller",
    "email": "davem@davemloft.net",
    "time": "Mon Apr 22 20:32:51 2013 -0400"
  },
  "committer": {
    "name": "David S. Miller",
    "email": "davem@davemloft.net",
    "time": "Mon Apr 22 20:32:51 2013 -0400"
  },
  "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tdrivers/net/ethernet/emulex/benet/be_main.c\n\tdrivers/net/ethernet/intel/igb/igb_main.c\n\tdrivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c\n\tinclude/net/scm.h\n\tnet/batman-adv/routing.c\n\tnet/ipv4/tcp_input.c\n\nThe e{uid,gid} --\u003e {uid,gid} credentials fix conflicted with the\ncleanup in net-next to now pass cred structs around.\n\nThe be2net driver had a bug fix in \u0027net\u0027 that overlapped with the VLAN\ninterface changes by Patrick McHardy in net-next.\n\nAn IGB conflict existed because in \u0027net\u0027 the build_skb() support was\nreverted, and in \u0027net-next\u0027 there was a comment style fix within that\ncode.\n\nSeveral batman-adv conflicts were resolved by making sure that all\ncalls to batadv_is_my_mac() are changed to have a new bat_priv first\nargument.\n\nEric Dumazet\u0027s TS ECR fix in TCP in \u0027net\u0027 conflicted with the F-RTO\nrewrite in \u0027net-next\u0027, mostly overlapping changes.\n\nThanks to Stephen Rothwell and Antonio Quartulli for help with several\nof these merge resolutions.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n",
  "tree_diff": []
}