]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit60955ccb5f162e0ee1ed859abedd1b88cfd25f57
tree94c8aea597b9e1ade376743a3f8f830e5195fa57
parent01073b017646da399b8eb0e43af02a28e59258e3
parentf261fb7178070199495dadda10029e86ec59cafa
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