m68k: merge the mmu and non-mmu versions of page_offset.h

Trivial merge of the mmu and non-mmu versions of page_offset.h

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

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

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

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