Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68kno...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Feb 2013 00:15:39 +0000 (16:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Feb 2013 00:15:39 +0000 (16:15 -0800)
commitf2ea97cbae25af2ec2ccfe892211c39147a8b4dc
treed3576ac9e9b4354fddfac44c745099321193442f
parent73c0d7522c2fb001c5da7f6d9138d23f468a7de7
parente95c3f7a09ed3996d8ccb9679f3bf38ba9b498d7
Merge branch 'for-linus' of git://git./linux/kernel/git/gerg/m68knommu into akpm

Pull m68knommu fix from Greg Ungerer:
 "This contains a single critical fix for the non-MMU m68k platforms.

  The change of the kernel exec code path has revealed a problem in the
  start thread code that causes crashing on boot.  This is the fix for
  it."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: fix trap on execing /bin/init