tree ee4373e3af08ad1ac303aa2abf8ed609408f1465
parent 04527fdafe2e12ad2d89bfd0f0bb7fe481687976
parent 21d380e54c30b5b15aa4167e2458bfe4e4862427
author Linus Torvalds <torvalds@linux-foundation.org> 1448846321 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1448846321 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull m68k fixes from Geert Uytterhoeven:
 "Summary:

   - Add missing initialization of max_pfn, which is needed to make
     selftests/vm/mlock2-tests succeed,

   - Wire up new mlock2 syscall"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Wire up mlock2
  m68knommu: Add missing initialization of max_pfn and {min,max}_low_pfn
  m68k/mm: sun3 - Add missing initialization of max_pfn and {min,max}_low_pfn
  m68k/mm: m54xx - Add missing initialization of max_pfn
  m68k/mm: motorola - Add missing initialization of max_pfn