diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-05-18 20:46:32 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-05-18 20:46:32 +0200 |
| commit | 0033c154a907885c647bc7929fe4bc6bc3b23743 (patch) | |
| tree | b8a1d3b4de6906180c1613c5fb03392a1ef62f07 /Documentation | |
| parent | 06132ee903e3b0fe3541970e017762a3df3e0551 (diff) | |
| parent | 2df83fa4bce421f8176932142f1004adfba0f9dd (diff) | |
| download | linux-0033c154a907885c647bc7929fe4bc6bc3b23743.tar.gz linux-0033c154a907885c647bc7929fe4bc6bc3b23743.tar.bz2 linux-0033c154a907885c647bc7929fe4bc6bc3b23743.zip | |
Merge branch 'pm-sleep'
* pm-sleep:
PM / Hibernate: Use get_gendisk to verify partition if resume_file is integer format
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index c1601e5a8b71..5900b49323cc 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -2372,6 +2372,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. resume= [SWSUSP] Specify the partition device for software suspend + Format: + {/dev/<dev> | PARTUUID=<uuid> | <int>:<int> | <hex>} resume_offset= [SWSUSP] Specify the offset from the beginning of the partition |