diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-01-11 05:10:08 +0100 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-01-11 05:10:08 +0100 |
commit | eed0ba0b4ab2d1668588219a8efa81bf8636a12d (patch) | |
tree | f5aa3c732e7830a1b24e6071f8bed0f799881187 /Documentation/kernel-parameters.txt | |
parent | powerpc/powermac: Make auto-loading of therm_pm72 possible (diff) | |
parent | powerpc/83xx: add mpc8308_p1m DMA controller device-tree node (diff) | |
download | linux-eed0ba0b4ab2d1668588219a8efa81bf8636a12d.tar.xz linux-eed0ba0b4ab2d1668588219a8efa81bf8636a12d.zip |
Merge remote branch 'gcl/next' into next
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r-- | Documentation/kernel-parameters.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 69bb6a9c871a..e51fbd88661d 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -2183,11 +2183,6 @@ and is between 256 and 4096 characters. It is defined in the file reset_devices [KNL] Force drivers to reset the underlying device during initialization. - resource_alloc_from_bottom - Allocate new resources from the beginning of available - space, not the end. If you need to use this, please - report a bug. - resume= [SWSUSP] Specify the partition device for software suspend |