commit | 6f7dd68b755b215deda5188a2c13c00f4776ea66 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jul 14 17:27:44 2010 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jul 14 17:27:44 2010 -0700 |
tree | 2a63c972ac89d7ae290910d5c6b1c6300ccbafd5 | |
parent | ea4c1a7e14051e2ba81fc7dc02e3d55bfb2d7548 [diff] | |
parent | 95f72d1ed41a66f1c1c29c24d479de81a0bea36f [diff] |
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