7d71ad0e6504af232be2795044ab686
parent 770e1ac5f29003fca18af4e67eb5a05ddb5b1491
author Linus Torvalds <torvalds@linux-foundation.org> 1310505679 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1310505679 -0700

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