From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 12 Jul 2011 21:21:19 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: v3.0~42
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d86e5f91440aa56a5df516bf58fe3883552ad56;p=pandora-kernel.git

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
---

8d86e5f91440aa56a5df516bf58fe3883552ad56