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/mm: Fix memory_block_size_bytes() for non-pseries mm: Move definition of MIN_MEMORY_BLOCK_SIZE to a header
Showing
- arch/powerpc/platforms/pseries/hotplug-memory.c 19 additions, 11 deletionsarch/powerpc/platforms/pseries/hotplug-memory.c
- arch/x86/mm/init_64.c 1 addition, 2 deletionsarch/x86/mm/init_64.c
- drivers/base/memory.c 0 additions, 1 deletiondrivers/base/memory.c
- include/linux/memory.h 2 additions, 0 deletionsinclude/linux/memory.h
Loading
Please register or sign in to comment