commit | 5b1755f23b98e0afaedaec8344002ab184646286 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Oct 05 11:56:55 2009 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Oct 05 11:56:55 2009 -0700 |
tree | fa8fd1a0a68335c7b3bc1b8e1bc26a1117c82f4e | |
parent | 374576a8b6f865022c0fd1ca62396889b23d66dd [diff] | |
parent | c84b564e82777b00ab48178a88bc533ba62b9922 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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