git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bf7058f)
m68k: merge the mmu and non-mmu versions of mmu.h
authorGreg Ungerer <gerg@uclinux.org>
Thu, 29 Jan 2009 05:57:30 +0000 (15:57 +1000)
committerGreg Ungerer <gerg@uclinux.org>
Tue, 24 Mar 2009 05:17:42 +0000 (15:17 +1000)
Trivial merge of the contents of mmu and non-mmu versions of mmu.h

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
arch/m68k/include/asm/mmu.h patch | blob | history
arch/m68k/include/asm/mmu_mm.h [deleted file] patch | blob | history
arch/m68k/include/asm/mmu_no.h [deleted file] patch | blob | history

diff --cc arch/m68k/include/asm/mmu.h
Simple merge
diff --cc arch/m68k/include/asm/mmu_mm.h
Simple merge
diff --cc arch/m68k/include/asm/mmu_no.h
Simple merge
Pandora Kernel Repository