)]}'
{
  "commit": "b57cb7231b2ce52d3dda14a7b417ae125fb2eb97",
  "tree": "b6b3af0b2866f76fe5db80af678f4b3d54cc9b81",
  "parents": [
    "ad12ab259d9131a53aa11c7c4561d97f7cc900df",
    "ae909ea4ad2431e085e6cc96446fbc1c1ae88498"
  ],
  "author": {
    "name": "Linus Torvalds",
    "email": "torvalds@linux-foundation.org",
    "time": "Wed Mar 21 18:17:51 2012 -0700"
  },
  "committer": {
    "name": "Linus Torvalds",
    "email": "torvalds@linux-foundation.org",
    "time": "Wed Mar 21 18:17:51 2012 -0700"
  },
  "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu\n\nPull m68knommu arch updates from Greg Ungerer:\n \"Includes a cleanup of the non-MMU linker script (it now almost\n  exclusively uses the well defined linker script support macros and\n  definitions).  Some more merging of MMU and non-MMU common files\n  (specifically the arch process.c, ptrace and time.c).  And a big\n  cleanup of the massively duplicated ColdFire device definition code.\n\n  Overall we remove about 2000 lines of code, and end up with a single\n  set of platform device definitions for the serial ports, ethernet\n  ports and QSPI ports common in most ColdFire SoCs.\n\n  I expect you will get a merge conflict on arch/m68k/kernel/process.c,\n  in cpu_idle().  It should be relatively strait forward to fixup.\"\n\nAnd cpu_idle() conflict resolution was indeed trivial (merging the\nnommu/mmu versions of process.c trivially conflicting with the\nconversion to use the schedule_preempt_disabled() helper function)\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (57 commits)\n  m68knommu: factor more common ColdFire cpu reset code\n  m68knommu: make 528x CPU reset register addressing consistent\n  m68knommu: make 527x CPU reset register addressing consistent\n  m68knommu: make 523x CPU reset register addressing consistent\n  m68knommu: factor some common ColdFire cpu reset code\n  m68knommu: move old ColdFire timers init from CPU init to timers code\n  m68knommu: clean up init code in ColdFire 532x startup\n  m68knommu: clean up init code in ColdFire 528x startup\n  m68knommu: clean up init code in ColdFire 523x startup\n  m68knommu: merge common ColdFire QSPI platform setup code\n  m68knommu: make 532x QSPI platform addressing consistent\n  m68knommu: make 528x QSPI platform addressing consistent\n  m68knommu: make 527x QSPI platform addressing consistent\n  m68knommu: make 5249 QSPI platform addressing consistent\n  m68knommu: make 523x QSPI platform addressing consistent\n  m68knommu: make 520x QSPI platform addressing consistent\n  m68knommu: merge common ColdFire FEC platform setup code\n  m68knommu: make 532x FEC platform addressing consistent\n  m68knommu: make 528x FEC platform addressing consistent\n  m68knommu: make 527x FEC platform addressing consistent\n  ...\n",
  "tree_diff": []
}