diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 09:14:38 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 09:14:38 -0400 |
| commit | d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f (patch) | |
| tree | 854ab394486288d40fa8179cbfaf66e8bdc44b0f /Documentation/feature-removal-schedule.txt | |
| parent | 73b2c7165b76b20eb1290e7efebc33cfd21db1ca (diff) | |
| parent | 3a09b1be53d23df780a0cd0e4087a05e2ca4a00c (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'Documentation/feature-removal-schedule.txt')
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 1a0fc32bc205..40a9c3239319 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
| @@ -647,3 +647,10 @@ Who: Stefan Richter <stefanr@s5r6.in-berlin.de> | |||
| 647 | 647 | ||
| 648 | ---------------------------- | 648 | ---------------------------- |
| 649 | 649 | ||
| 650 | What: The acpi_sleep=s4_nonvs command line option | ||
| 651 | When: 2.6.37 | ||
| 652 | Files: arch/x86/kernel/acpi/sleep.c | ||
| 653 | Why: superseded by acpi_sleep=nonvs | ||
| 654 | Who: Rafael J. Wysocki <rjw@sisk.pl> | ||
| 655 | |||
| 656 | ---------------------------- | ||