Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Mar 2011 00:47:58 +0000 (17:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Mar 2011 00:47:58 +0000 (17:47 -0700)
commitffbf0ab1a648b867ce953cc43557090f679bb9c1
treedf90a9fe3b46b636d977e9aa993efe5588436d1c
parent73939bb56acef1c9e776a10f0aeea0456d6815f6
parent66d857b08b8c3ed5c72c361f863cce77d2a978d7
Merge branch 'for-linus' of git://git./linux/kernel/git/gerg/m68knommu

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: merge m68k and m68knommu arch directories