diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-14 17:27:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-14 17:27:44 -0700 |
| commit | 6f7dd68b755b215deda5188a2c13c00f4776ea66 (patch) | |
| tree | 2a63c972ac89d7ae290910d5c6b1c6300ccbafd5 /Documentation/kernel-parameters.txt | |
| parent | ea4c1a7e14051e2ba81fc7dc02e3d55bfb2d7548 (diff) | |
| parent | 95f72d1ed41a66f1c1c29c24d479de81a0bea36f (diff) | |
| download | talos-obmc-linux-6f7dd68b755b215deda5188a2c13c00f4776ea66.tar.gz talos-obmc-linux-6f7dd68b755b215deda5188a2c13c00f4776ea66.zip | |
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
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 82d6aeb5228f..4ddb58df081e 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1265,7 +1265,7 @@ and is between 256 and 4096 characters. It is defined in the file If there are multiple matching configurations changing the same attribute, the last one is used. - lmb=debug [KNL] Enable lmb debug messages. + memblock=debug [KNL] Enable memblock debug messages. load_ramdisk= [RAM] List of ramdisks to load from floppy See Documentation/blockdev/ramdisk.txt. |
