| commit | 8d86e5f91440aa56a5df516bf58fe3883552ad56 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jul 12 14:21:19 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jul 12 14:21:19 2011 -0700 |
| tree | 94c8aea597b9e1ade376743a3f8f830e5195fa57 | |
| parent | d93a881dd7d71ad0e6504af232be2795044ab686 [diff] | |
| parent | 770e1ac5f29003fca18af4e67eb5a05ddb5b1491 [diff] |
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