Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/vsx: Fix VSX alignment handler for regs 32-63 powerpc/ps3: Move ps3_mm_add_memory to device_initcall powerpc/mm: Fix numa reserve bootmem page selection powerpc/mm: Fix _PAGE_CHG_MASK to protect _PAGE_SPECIAL
Showing
- arch/powerpc/include/asm/pgtable-4k.h 1 addition, 1 deletionarch/powerpc/include/asm/pgtable-4k.h
- arch/powerpc/include/asm/pgtable-64k.h 1 addition, 1 deletionarch/powerpc/include/asm/pgtable-64k.h
- arch/powerpc/include/asm/pgtable-ppc32.h 2 additions, 1 deletionarch/powerpc/include/asm/pgtable-ppc32.h
- arch/powerpc/kernel/align.c 6 additions, 1 deletionarch/powerpc/kernel/align.c
- arch/powerpc/mm/numa.c 3 additions, 2 deletionsarch/powerpc/mm/numa.c
- arch/powerpc/platforms/ps3/mm.c 1 addition, 1 deletionarch/powerpc/platforms/ps3/mm.c
Loading
Please register or sign in to comment