diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-01-10 23:10:08 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-01-10 23:10:08 -0500 |
| commit | eed0ba0b4ab2d1668588219a8efa81bf8636a12d (patch) | |
| tree | f5aa3c732e7830a1b24e6071f8bed0f799881187 /Documentation/kernel-parameters.txt | |
| parent | 98b14d6b290d96b24ae993ceaccc59b2aa4b130c (diff) | |
| parent | c9de9333f5a860cab82052bce6ac28bcac9b2c26 (diff) | |
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 | |||
| 2183 | reset_devices [KNL] Force drivers to reset the underlying device | 2183 | reset_devices [KNL] Force drivers to reset the underlying device |
| 2184 | during initialization. | 2184 | during initialization. |
| 2185 | 2185 | ||
| 2186 | resource_alloc_from_bottom | ||
| 2187 | Allocate new resources from the beginning of available | ||
| 2188 | space, not the end. If you need to use this, please | ||
| 2189 | report a bug. | ||
| 2190 | |||
| 2191 | resume= [SWSUSP] | 2186 | resume= [SWSUSP] |
| 2192 | Specify the partition device for software suspend | 2187 | Specify the partition device for software suspend |
| 2193 | 2188 | ||