git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c8bd427)
m68k: merge the mmu and non-mmu versions of pgalloc.h
authorGreg Ungerer <gerg@uclinux.org>
Thu, 5 Feb 2009 00:01:00 +0000 (10:01 +1000)
committerGreg Ungerer <gerg@uclinux.org>
Tue, 24 Mar 2009 05:17:43 +0000 (15:17 +1000)
Trivial merge of the mmu and non-mmu version of pgalloc.h

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

diff --cc arch/m68k/include/asm/pgalloc.h
Simple merge
diff --cc arch/m68k/include/asm/pgalloc_mm.h
Simple merge
diff --cc arch/m68k/include/asm/pgalloc_no.h
Simple merge
Pandora Kernel Repository