Merge branch 'lmb-to-memblock' of git://git.kernel.org/pub/scm/linux/kernel/git/benh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Jul 2010 00:27:44 +0000 (17:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Jul 2010 00:27:44 +0000 (17:27 -0700)
commit6f7dd68b755b215deda5188a2c13c00f4776ea66
tree2a63c972ac89d7ae290910d5c6b1c6300ccbafd5
parentea4c1a7e14051e2ba81fc7dc02e3d55bfb2d7548
parent95f72d1ed41a66f1c1c29c24d479de81a0bea36f
Merge branch 'lmb-to-memblock' of git://git./linux/kernel/git/benh/powerpc

* 'lmb-to-memblock' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  lmb: rename to memblock