From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 15 Jul 2010 00:27:44 +0000 (-0700)
Subject: Merge branch 'lmb-to-memblock' of git://git.kernel.org/pub/scm/linux/kernel/git/benh... 
X-Git-Tag: v2.6.35-rc6~41
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=6f7dd68b755b215deda5188a2c13c00f4776ea66;p=net-next-2.6.git

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

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

6f7dd68b755b215deda5188a2c13c00f4776ea66