Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k,m68knommu: merge header files

Resolve trivial conflict in arch/m68knommu/include/asm/Kbuild

diff --cc Makefile
Simple merge

diff --cc arch/m68k/include/asm/Kbuild
Simple merge

diff --cc arch/m68k/include/asm/byteorder_mm.h
Simple merge

diff --cc arch/m68k/include/asm/byteorder_no.h
Simple merge

diff --cc arch/m68k/include/asm/unistd_mm.h
Simple merge