diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 09:19:22 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 09:19:22 -0400 |
| commit | f13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0 (patch) | |
| tree | 44419bd03c33e662302dd003f57d36e133144f91 /Documentation/feature-removal-schedule.txt | |
| parent | e910b63d009701ad4ebbeb089aba35707fa5d68e (diff) | |
| parent | 5da3e714e30d40145f4dd37d79de6bbbcb9e6137 (diff) | |
Merge branch 'shmobile' into devel
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 c268783bc4e7..1571c0c83dba 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 | ---------------------------- | ||