Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Jul 2011 21:21:19 +0000 (14:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Jul 2011 21:21:19 +0000 (14:21 -0700)
commit8d86e5f91440aa56a5df516bf58fe3883552ad56
tree94c8aea597b9e1ade376743a3f8f830e5195fa57
parentd93a881dd7d71ad0e6504af232be2795044ab686
parent770e1ac5f29003fca18af4e67eb5a05ddb5b1491
Merge branch 'merge' of git://git./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