Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
commit5b1755f23b98e0afaedaec8344002ab184646286
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 5 Oct 2009 18:56:55 +0000 (5 11:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 5 Oct 2009 18:56:55 +0000 (5 11:56 -0700)
treefa8fd1a0a68335c7b3bc1b8e1bc26a1117c82f4e
parent374576a8b6f865022c0fd1ca62396889b23d66dd
parentc84b564e82777b00ab48178a88bc533ba62b9922
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:
  m68knommu: fix rename of pt_regs offset defines breakage
  m68knommu: remove duplicated #include
  m68knommu: show KiB rather than pages in "Freeing initrd memory:" message